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

Stephen Rothwell
2013-04-04T04:40:21Z

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

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

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

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