linux-kernel - Re: linux-next: manual merge of the kvm-riscv tree with the risc-v 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: <20231106093157.24f46f82@canb.auug.org.au>
Date:   Mon, 6 Nov 2023 09:31:57 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>
Cc:     Anup Patel <anup@...infault.org>,
        Andrew Jones <ajones@...tanamicro.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mayuresh Chitale <mchitale@...tanamicro.com>,
        Palmer Dabbelt <palmer@...osinc.com>,
        Paolo Bonzini <pbonzini@...hat.com>, KVM <kvm@...r.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-riscv tree with the risc-v
 tree

Hi all,

On Wed, 1 Nov 2023 13:37:43 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> On Mon, 30 Oct 2023 12:53:02 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Today's linux-next merge of the kvm-riscv tree got a conflict in:
> > 
> >   arch/riscv/include/asm/csr.h
> > 
> > between commit:
> > 
> >   43c16d51a19b ("RISC-V: Enable cbo.zero in usermode")
> > 
> > from the risc-v tree and commits:
> > 
> >   db3c01c7a308 ("RISCV: KVM: Add senvcfg context save/restore")
> >   81f0f314fec9 ("RISCV: KVM: Add sstateen0 context save/restore")
> > 
> > from the kvm-riscv tree.
> > 
> > I fixed it up (I just used the latter version of this file) 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.  
> 
> This is now a conflict between the kvm tree and the risc-v tree.

This is now a conflict between the risc-v tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped