Messages in this thread | | | Date | Thu, 4 Apr 2013 18:44:50 -0700 | From | Greg KH <> | Subject | Re: 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
| |