linux-next: manual merge of the configfs tree with the tree

[Stephen Rothwell]

Hi Joel,

Today's linux-next merge of the configfs tree got a conflict in
fs/configfs/dir.c between commit 420118caa32c8ccdf9fce5a623b9de3f951573c5
("configfs: Rework configfs_depend_item() locking and make lockdep
happy") from Linus' tree and commit
8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 ("configfs: Rework
configfs_depend_item() locking and make lockdep happy") from the configfs
tree.

Two versions of the same patch (even the same author date).  I have no
idea what to do with these, so I just took the version from Linus' tree
(since that had a slightly later commit date).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature