linux-kernel - Re: linux-next: manual merge of the risc-v tree with the arm-soc 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-prev] [day] [month] [year] [list]

Message-ID: <20210215080921.1643a833@canb.auug.org.au>
Date:   Mon, 15 Feb 2021 08:09:21 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Palmer Dabbelt <palmer@...belt.com>,
        Paul Walmsley <paul@...an.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Damien Le Moal <damien.lemoal@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Palmer Dabbelt <palmerdabbelt@...gle.com>
Subject: Re: linux-next: manual merge of the risc-v tree with the arm-soc
 tree

Hi all,

On Mon, 25 Jan 2021 09:12:56 +1100 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped