From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>
Cc: Damien Le Moal <damien.lemoal@wdc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Palmer Dabbelt <palmerdabbelt@google•com>
Subject: Re: linux-next: manual merge of the risc-v tree with the arm-soc tree
Date: Mon, 15 Feb 2021 08:09:21 +1100 [thread overview]
Message-ID: <20210215080921.1643a833@canb.auug.org.au> (raw)
In-Reply-To: <20210125091256.302fd411@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1804 bytes --]
Hi all,
On Mon, 25 Jan 2021 09:12:56 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the risc-v tree got conflicts in:
>
> drivers/soc/Kconfig
> drivers/soc/Makefile
>
> between commit:
>
> 89d4f98ae90d ("ARM: remove zte zx platform")
>
> from the arm-soc tree and commit:
>
> 08734e0581a5 ("riscv: Use vendor name for K210 SoC support")
>
> from the risc-v 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.
>
> diff --cc drivers/soc/Kconfig
> index f357c6c659d2,c0143651f4a9..000000000000
> --- a/drivers/soc/Kconfig
> +++ b/drivers/soc/Kconfig
> @@@ -22,6 -23,6 +23,5 @@@ source "drivers/soc/ti/Kconfig
> source "drivers/soc/ux500/Kconfig"
> source "drivers/soc/versatile/Kconfig"
> source "drivers/soc/xilinx/Kconfig"
> - source "drivers/soc/kendryte/Kconfig"
> -source "drivers/soc/zte/Kconfig"
>
> endmenu
> diff --cc drivers/soc/Makefile
> index 9bceb12b291d,fa7071246546..000000000000
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@@ -28,4 -28,5 +28,4 @@@ obj-y += ti
> obj-$(CONFIG_ARCH_U8500) += ux500/
> obj-$(CONFIG_PLAT_VERSATILE) += versatile/
> obj-y += xilinx/
> - obj-$(CONFIG_SOC_KENDRYTE) += kendryte/
> -obj-$(CONFIG_ARCH_ZX) += zte/
> + obj-$(CONFIG_SOC_CANAAN) += canaan/
With the merge window about to open, this is a reminder that this
conflict still exists.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-14 21:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 22:12 linux-next: manual merge of the risc-v tree with the arm-soc tree Stephen Rothwell
2021-01-25 9:44 ` Arnd Bergmann
2021-02-14 21:09 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-25 22:45 Stephen Rothwell
2025-11-26 15:30 ` Drew Fustini
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=20210215080921.1643a833@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=damien.lemoal@wdc$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmerdabbelt@google$(echo .)com \
--cc=paul@pwsan$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox