Hi all, Today's linux-next merge of the amlogic tree got a conflict in: MAINTAINERS between commit: 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") from the arm-soc tree and commit: 9e70e49474bb ("MAINTAINERS: add PHY-related files to Amlogic SoC file list") from the amlogic tree. I fixed it up (see below) 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 diff --cc MAINTAINERS index 7ad2bf6ac1af,9f769aa65936..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1912,7 -1915,8 +1912,8 @@@ L: linux-arm-kernel@xxxxxxxxxxxxxxxxxx L: linux-amlogic@xxxxxxxxxxxxxxxxxxx S: Maintained W: http://linux-meson.com/ + F: Documentation/devicetree/bindings/phy/amlogic* -F: arch/arm/boot/dts/meson* +F: arch/arm/boot/dts/amlogic/ F: arch/arm/mach-meson/ F: arch/arm64/boot/dts/amlogic/ F: drivers/mmc/host/meson*
Attachment:
pgpD8Zaz4C9eQ.pgp
Description: OpenPGP digital signature