Messages in this thread | | | Date | Mon, 8 Oct 2018 11:03:19 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rdma tree with the vfs tree |
| |
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/infiniband/Kconfig
between commit:
f57d445eb317 ("Make anon_inodes unconditional")
from the vfs tree and commit:
914e5d7d4697 ("RDMA: Fix building with CONFIG_MMU=n")
from the rdma tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc drivers/infiniband/Kconfig index 176b943dfec9,0a3ec7c726ec..000000000000 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@@ -25,6 -25,8 +25,7 @@@ config INFINIBAND_USER_MA config INFINIBAND_USER_ACCESS tristate "InfiniBand userspace access (verbs and CM)" - select ANON_INODES + depends on MMU ---help--- Userspace InfiniBand access support. This enables the kernel side of userspace verbs and the userspace [unhandled content-type:application/pgp-signature] | |