Hi all, Today's linux-next merge of the block tree got a conflict in:
block/bfq-iosched.c
between commit:
eed47d19d936 ("block, bfq: fix use after free in bfq_bfqq_expire")
from Linus' tree and commit:
636b8fe86bed ("block, bfq: fix some typos in comments")
from the block tree.
I fixed it up (the former included the fix from the latter, so I just
used that) 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
pgpiKr3dDC2JG.pgp
Description: OpenPGP digital signature
