Hi Joel,
The linux-next merge of the configfs tree gets 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. I have been getting this for some time.
The former is just a newer version of the latter. Since all the commits
in the configfs tree seem to be in Linus' tree now, could you please
update it to be his tree to fix the above conflict, thanks. (The
configfs tree for linux-next hasn't been updated since April 30.)
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp9ObrRqFU8f.pgp
Description: PGP signature
