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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/