Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
drivers/block/null_blk/main.c
between commit:
8b631f9cf0b8 ("null_blk: remove the bio based I/O path")
from the block tree and commit:
f3687f2f7db4 ("block: null_blk: replace get_tag() with a generic find_and_set_bit_lock()")
from the bitmap tree.
I fixed it up (the former removed the code updated by 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
Attachment:
pgp6ayRRIDaDC.pgp
Description: OpenPGP digital signature
