lkml.org 
[lkml]   [2013]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with the vfs tree
On Thu, Apr 04, 2013 at 03:43:29PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/ccg/f_fs.c and drivers/staging/ccg/rndis.c between
> commits 465bced2e3ed ("ccg: don't bother with fops->owner") and
> 4dfac87dca02 ("procfs: new helper - PDE_DATA(inode)") from the vfs tree
> and commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from
> the staging tree.
>
> The latter just deletes the files, so I did that and can carry the fix as
> necessary (no action is required).

Sounds correct, thanks.

greg k-h


\
 
 \ /
  Last update: 2013-04-05 04:21    [W:0.056 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site