linux-next: manual merge of the rcu tree with Linus' tree
From: Stephen Rothwell
Date: Mon Jun 11 2018 - 20:46:16 EST
Today's linux-next merge of the rcu tree got a conflict in:
94c793accacd ("iommu/amd: Hide unused iommu_table_lock")
from Linus' tree and commit:
1df9bb146146 ("EXP iommu: Placeholder for fix in mainline")
from the rcu tree.
I fixed it up (they share some code change) 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.
Description: OpenPGP digital signature