All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	Herbert Xu <herbert@gondor.apana.org.au>
Cc: Linux Crypto List <linux-crypto@vger.kernel.org>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	Conor Dooley <conor.dooley@microchip.com>,
	Jenny Zhang <jenny.zhang@starfivetech.com>,
	Jia Jie Ho <jiajie.ho@starfivetech.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Walker Chen <walker.chen@starfivetech.com>,
	William Qiu <william.qiu@starfivetech.com>
Subject: linux-next: manual merge of the mmc tree with the arm-soc, crypto trees
Date: Wed, 15 Feb 2023 11:16:23 +1100	[thread overview]
Message-ID: <20230215111623.06d9aa24@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]

Hi all,

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

  MAINTAINERS

between commits:

  08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver")
  c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC")

from the arm-soc, crypto trees and commit:

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

from the mmc 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 9262a1d7203d,71355c68a237..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19840,25 -19926,12 +19840,31 @@@ F:	Documentation/devicetree/bindings/re
  F:	drivers/reset/reset-starfive-jh7100.c
  F:	include/dt-bindings/reset/starfive-jh7100.h
  
+ STARFIVE JH7110 MMC/SD/SDIO DRIVER
+ M:	William Qiu <william.qiu@starfivetech.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/mmc/starfive*
+ F:	drivers/mmc/dw_mmc-starfive.c
+ 
 +STARFIVE JH71XX PMU CONTROLLER DRIVER
 +M:	Walker Chen <walker.chen@starfivetech.com>
 +S:	Supported
 +F:	Documentation/devicetree/bindings/power/starfive*
 +F:	drivers/soc/starfive/jh71xx_pmu.c
 +F:	include/dt-bindings/power/starfive,jh7110-pmu.h
 +
 +STARFIVE SOC DRIVERS
 +M:	Conor Dooley <conor@kernel.org>
 +S:	Maintained
 +T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:	drivers/soc/starfive/
 +
 +STARFIVE TRNG DRIVER
 +M:	Jia Jie Ho <jiajie.ho@starfivetech.com>
 +S:	Supported
 +F:	Documentation/devicetree/bindings/rng/starfive*
 +F:	drivers/char/hw_random/jh7110-trng.c
 +
  STATIC BRANCH/CALL
  M:	Peter Zijlstra <peterz@infradead.org>
  M:	Josh Poimboeuf <jpoimboe@kernel.org>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	Herbert Xu <herbert@gondor.apana.org.au>
Cc: Linux Crypto List <linux-crypto@vger.kernel.org>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	Conor Dooley <conor.dooley@microchip.com>,
	Jenny Zhang <jenny.zhang@starfivetech.com>,
	Jia Jie Ho <jiajie.ho@starfivetech.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Walker Chen <walker.chen@starfivetech.com>,
	William Qiu <william.qiu@starfivetech.com>
Subject: linux-next: manual merge of the mmc tree with the arm-soc, crypto trees
Date: Wed, 15 Feb 2023 11:16:23 +1100	[thread overview]
Message-ID: <20230215111623.06d9aa24@canb.auug.org.au> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 2020 bytes --]

Hi all,

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

  MAINTAINERS

between commits:

  08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver")
  c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC")

from the arm-soc, crypto trees and commit:

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

from the mmc 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 9262a1d7203d,71355c68a237..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19840,25 -19926,12 +19840,31 @@@ F:	Documentation/devicetree/bindings/re
  F:	drivers/reset/reset-starfive-jh7100.c
  F:	include/dt-bindings/reset/starfive-jh7100.h
  
+ STARFIVE JH7110 MMC/SD/SDIO DRIVER
+ M:	William Qiu <william.qiu@starfivetech.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/mmc/starfive*
+ F:	drivers/mmc/dw_mmc-starfive.c
+ 
 +STARFIVE JH71XX PMU CONTROLLER DRIVER
 +M:	Walker Chen <walker.chen@starfivetech.com>
 +S:	Supported
 +F:	Documentation/devicetree/bindings/power/starfive*
 +F:	drivers/soc/starfive/jh71xx_pmu.c
 +F:	include/dt-bindings/power/starfive,jh7110-pmu.h
 +
 +STARFIVE SOC DRIVERS
 +M:	Conor Dooley <conor@kernel.org>
 +S:	Maintained
 +T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:	drivers/soc/starfive/
 +
 +STARFIVE TRNG DRIVER
 +M:	Jia Jie Ho <jiajie.ho@starfivetech.com>
 +S:	Supported
 +F:	Documentation/devicetree/bindings/rng/starfive*
 +F:	drivers/char/hw_random/jh7110-trng.c
 +
  STATIC BRANCH/CALL
  M:	Peter Zijlstra <peterz@infradead.org>
  M:	Josh Poimboeuf <jpoimboe@kernel.org>

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2023-02-15  0:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-15  0:16 Stephen Rothwell [this message]
2023-02-15  0:16 ` linux-next: manual merge of the mmc tree with the arm-soc, crypto trees Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230215111623.06d9aa24@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=conor.dooley@microchip.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=jenny.zhang@starfivetech.com \
    --cc=jiajie.ho@starfivetech.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=ulf.hansson@linaro.org \
    --cc=walker.chen@starfivetech.com \
    --cc=william.qiu@starfivetech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.