Hi all,
Today's linux-next merge of the realtek tree got a conflict in:
MAINTAINERS
between commit:
3b50142d8528 ("MAINTAINERS: sort field names for all entries")
from Linus' tree and commit:
d6656fa4c621 ("ARM: Prepare Realtek RTD1195")
from the realtek 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 6851ef7cf1bd,1b15d2dd2535..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2269,8 -2203,10 +2269,9 @@@ M: Andreas Färber <afaerber@xxxxxxx
L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
L: linux-realtek-soc@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
S: Maintained
-F: arch/arm/boot/dts/rtd*
+F: Documentation/devicetree/bindings/arm/realtek.yaml
+ F: arch/arm/mach-realtek/
F: arch/arm64/boot/dts/realtek/
-F: Documentation/devicetree/bindings/arm/realtek.yaml
ARM/RENESAS ARM64 ARCHITECTURE
M: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Attachment:
pgpUXZDKteMm3.pgp
Description: OpenPGP digital signature
