Hi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
drivers/gpio/gpiolib.c
between commit:
0102fbf52b93 ("gpiolib: don't check the retval of get_direction() when registering a chip")
from the gpio-brgl-fixes tree and commit:
9becde08f1bc ("gpiolib: don't use gpiochip_get_direction() when registering a chip")
from the gpio-brgl tree.
I fixed it up (I used the latter as the conflict was just in a comment)
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:
pgpkRabLSg971.pgp
Description: OpenPGP digital signature
