Hi all,
Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/core/uverbs_main.c between commit
ce916e2b935f8b3402da1457ff23b9f9f786c09b ("switch infiniband uverbs to
anon_inodes") from the vfs tree and commit
4169c4a9735d6434c9e39fa81ae5517e3afd4cd8 ("IB/uverbs: Use anon_inodes
instead of private infinibandeventfs") from the infiniband tree.These two commits purport to do something similar. Someone should look at them both and decide which one is right. For now I have used the version from the vfs tree - with the addition of the part from the infiniband tree version that selects ANON_INODES in the Kconfig file. -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
pgpTYxtornmxT.pgp
Description: PGP signature
