Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 18 Nov 2022 16:06:17 +1100

Hi all,

Today's linux-next merge of the pinctrl tree got a conflict in:

  MAINTAINERS

between commit:

  b82621ac8450 ("soc: loongson: add GUTS driver for loongson-2 platforms")

from the arm-soc tree and commit:

  457ff9fb29d7 ("dt-bindings: pinctrl: add loongson-2 pinctrl")

from the pinctrl 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 ec383d27e762,f76107c24949..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12097,13 -12013,14 +12097,21 @@@ F:	drivers/*/*loongarch
  F:	Documentation/loongarch/
  F:	Documentation/translations/zh_CN/loongarch/
  
 +LOONGSON-2 SOC SERIES GUTS DRIVER
 +M:	Yinbo Zhu <[email-masked]>
 +L:	[email-masked]
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml
 +F:	drivers/soc/loongson/loongson2_guts.c
 +
+ LOONGSON-2 SOC SERIES PINCTRL DRIVER
+ M:	zhanghongchen <[email-masked]>
+ M:	Yinbo Zhu <[email-masked]>
+ L:	[email-masked]
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
+ F:	drivers/pinctrl/pinctrl-loongson2.c
+ 
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:	Sathya Prakash <[email-masked]>
  M:	Sreekanth Reddy <[email-masked]>