linux-next: manual merge of the xfs tree with Linus' tree
From: Stephen Rothwell
Date: Wed Jul 20 2016 - 21:08:03 EST
Today's linux-next merge of the xfs tree got a conflict in:
3e0a39654645 ("xfs: fix type confusion in xfs_ioc_swapext")
from Linus' tree and commit:
7f1b62457b58 ("xfs: fix type confusion in xfs_ioc_swapext")
from the xfs tree.
These are not quite the same patch :-(
I fixed it up (I used the version in the xfs tree) 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.