linux-kernel - Re: linux-next: manual merge of the kvm-x86 tree with the kvm6390 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: <ZuGrkqwbBt2V0dJL@google.com>
Date: Wed, 11 Sep 2024 07:39:14 -0700
From: Sean Christopherson <seanjc@...gle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Christian Borntraeger <borntraeger@...ibm.com>, Janosch Frank <frankja@...ux.ibm.com>, 
	Christoph Schlameuss <schlameuss@...ux.ibm.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm6390 tree

On Wed, Sep 11, 2024, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
> 
>   tools/testing/selftests/kvm/.gitignore
> 
> between commit:
> 
>   011901fc2224 ("selftests: kvm: s390: Add s390x ucontrol test suite with hpage test")
> 
> from the kvm6390 tree and commit:
> 
>   9d15171f39f0 ("KVM: selftests: Explicitly include committed one-off assets in .gitignore")
> 
> from the kvm-x86 tree.
> 
> I fixed it up (the latter includes the former) and can carry the fix as

Ya, I'll make sure to note this in my pull request to Paolo, but I don't think
there's anything else to be done at this time.

Thanks Stephen!

> 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.