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

Message-ID: <20210224090048.5855942c@canb.auug.org.au>
Date:   Wed, 24 Feb 2021 09:00:48 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        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: linux-next: manual merge of the risc-v tree with Linus' tree

Hi all,

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

  drivers/soc/Makefile

between commit:

  89d4f98ae90d ("ARM: remove zte zx platform")

from Linus' tree and commits:

  08734e0581a5 ("riscv: Use vendor name for K210 SoC support")
  e134d426e1a3 ("soc: canaan: Sort the Makefile alphabetically")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/soc/Makefile
index 9bceb12b291d,34b23645be14..000000000000
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -28,4 -29,4 +29,3 @@@ 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/

Content of type "application/pgp-signature" skipped