linux-kernel - linux-next: manual merge of the pinctrl tree with the mmc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230216124004.2be84a01@canb.auug.org.au>
Date:   Thu, 16 Feb 2023 12:40:04 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linus Walleij <linus.walleij@...aro.org>,
        Ulf Hansson <ulf.hansson@...aro.org>
Cc:     Emil Renner Berthing <kernel@...il.dk>,
        Hal Feng <hal.feng@...rfivetech.com>,
        Jianlong Huang <jianlong.huang@...rfivetech.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        William Qiu <william.qiu@...rfivetech.com>
Subject: linux-next: manual merge of the pinctrl tree with the mmc tree

Hi all,

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

  MAINTAINERS

between commit:

  9e622229bbf4 ("mmc: starfive: Add sdio/emmc driver support")

from the mmc tree and commit:

  d6e0a660097d ("dt-bindings: pinctrl: Add StarFive JH7110 sys 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 1208b0380fa5,8a851eb053ca..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19914,19 -19890,15 +19914,21 @@@ F:	Documentation/devicetree/bindings/cl
  F:	drivers/clk/starfive/clk-starfive-jh7100*
  F:	include/dt-bindings/clock/starfive-jh7100*.h
  
 +STARFIVE JH7110 MMC/SD/SDIO DRIVER
 +M:	William Qiu <william.qiu@...rfivetech.com>
 +S:	Supported
 +F:	Documentation/devicetree/bindings/mmc/starfive*
 +F:	drivers/mmc/host/dw_mmc-starfive.c
 +
- STARFIVE JH7100 PINCTRL DRIVER
+ STARFIVE JH71X0 PINCTRL DRIVERS
  M:	Emil Renner Berthing <kernel@...il.dk>
+ M:	Jianlong Huang <jianlong.huang@...rfivetech.com>
  L:	linux-gpio@...r.kernel.org
  S:	Maintained
- F:	Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
- F:	drivers/pinctrl/starfive/
+ F:	Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
+ F:	drivers/pinctrl/starfive/pinctrl-starfive-jh71*
  F:	include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
+ F:	include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
  
  STARFIVE JH7100 RESET CONTROLLER DRIVER
  M:	Emil Renner Berthing <kernel@...il.dk>

Content of type "application/pgp-signature" skipped