linux-kernel - linux-next: manual merge of the csky 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: <20220404082320.1a397088@canb.auug.org.au>
Date:   Mon, 4 Apr 2022 08:24:07 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Guo Ren <ren_guo@...ky.com>
Cc:     Anup Patel <anup.patel@....com>, Anup Patel <anup@...infault.org>,
        Guo Ren <guoren@...nel.org>,
        Guo Ren <guoren@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Palmer Dabbelt <palmer@...osinc.com>
Subject: linux-next: manual merge of the csky tree with Linus' tree

Hi all,

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

  arch/riscv/configs/rv32_defconfig

between commits:

  d56201d9440d ("riscv: defconfig: enable hugetlbfs option")
  f6e64b66629e ("RISC-V: Enable CPU_IDLE drivers")
  c5179ef1ca0c ("RISC-V: Enable RISC-V SBI CPU Idle driver for QEMU virt machine")
  2e7451fb5763 ("RISC-V: Enable profiling by default")
  6f562570b9c5 ("RISC-V: defconfig: Drop redundant SBI HVC and earlycon")

from Linus' tree and commit:

  0f6ffeaeed8f ("riscv: Fixup difference with defconfig")

from the csky 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.

I am trying to figure out why all these commits affecting the riscv
architecture have suddenly turned up in the csky tree (and just before
the merge window closed).

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped