linux-kernel - Re: linux-next: manual merge of the kvms390 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190621100506.16a04050.cohuck@redhat.com>
Date:   Fri, 21 Jun 2019 10:05:06 +0200
From:   Cornelia Huck <cohuck@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Christian Borntraeger <borntraeger@...ibm.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Aaron Lewis <aaronlewis@...gle.com>,
        Paolo Bonzini <pbonzini@...hat.com>,
        Thomas Huth <thuth@...hat.com>
Subject: Re: linux-next: manual merge of the kvms390 tree with Linus' tree

On Fri, 21 Jun 2019 15:43:15 +1000
Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>   tools/testing/selftests/kvm/Makefile
> 
> between commit:
> 
>   61cfcd545e42 ("kvm: tests: Sort tests in the Makefile alphabetically")
> 
> from Linus' tree and commits:
> 
>   ee1563f42856 ("KVM: selftests: Add the sync_regs test for s390x")
>   49fe9a5d1638 ("KVM: selftests: Move kvm_create_max_vcpus test to generic code")
> 
> from the kvms390 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.
> 

Thanks, looks good.

Content of type "application/pgp-signature" skipped