Hi all,
Today's linux-next merge of the battery tree got a conflict in:
drivers/power/supply/cw2015_battery.c
between commit:
ed5c2f5fd10d ("i2c: Make remove callback return void")
from the i2c tree and commit:
ed5c2f5fd10d ("i2c: Make remove callback return void")
from the battery tree.
I fixed it up (the latter removed the code modified by the former, so
I just did 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
Attachment:
pgpjSrIjGeeHn.pgp
Description: OpenPGP digital signature
