Messages in this thread | | | Date | Thu, 4 Apr 2013 18:45:05 -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:40:17PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/dgrp/dgrp_specproc.c between commit 464b4fd02caa ("dgrp > procfs fixes, part 2") and various other commits from the vfs tree and > commit 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the > staging tree. > > I just used the version from the vfs tree and can carry the fix as > necessary (no action is required).
That is correct, thanks.
greg k-h
| |