Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
arch/x86/mm/tlb.c
between commit:
94b1b03b519b ("x86/mm: Rework lazy TLB mode and TLB freshness tracking")
from the tip tree and commit:
d7713e8f8b23 ("membarrier: Expedited private command")
from the rcu tree.
I fixed it up (the former removed the comment and the load_cr3(), so I
just dropped the commend change in the latter) 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
