linux-next: manual merge of the staging tree with the vfs tree

Stephen Rothwell
2013-04-04T04:34:42Z

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

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).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]