Messages in this thread | | | Date | Thu, 4 Apr 2013 18:45:18 -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:34:33PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/staging/dgrp/dgrp_dpa_ops.c, drivers/staging/dgrp/dgrp_mon_ops.c, > drivers/staging/dgrp/dgrp_net_ops.c and > drivers/staging/dgrp/dgrp_ports_ops.c between commit 33633903f16f ("dgrp > procfs fixes, part 5: per-node files") from the vfs tree and commit > 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the staging > tree. > > The former removed the code modified by the latter, so I just did that > and can carry the fix as necessary (no action is required).
That is correct, thanks.
greg k-h
| |