Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/ata/ahci-platform.yaml
between commit:
69e32a7070fb ("dt-bindings: ata: Add UniPhier controller binding")
from the libata tree and commit:
5bae6ac11938 ("dt-bindings: ata: Drop unneeded quotes")
from the devicetree tree.
I fixed it up (the former removed the text 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:
pgpo_R2OUekXC.pgp
Description: OpenPGP digital signature
