Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
include/linux/bitops.h
between commit:
120c5991cbae ("bitops: optimize fns() for improved performance")
from the mm-nonmm-unstable branch of the mm tree and commit:
1b6ef2812522 ("bitops: Optimize fns() for improved performance")
from the bitmap tree.
I fixed it up (I just used the latter as it had a more recent date) 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
Attachment:
pgpKmk_GEbHIq.pgp
Description: OpenPGP digital signature
