From: Cornelia Huck <cohuck@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Christian Borntraeger <borntraeger@de•ibm.com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Aaron Lewis <aaronlewis@google•com>,
Paolo Bonzini <pbonzini@redhat•com>,
Thomas Huth <thuth@redhat•com>
Subject: Re: linux-next: manual merge of the kvms390 tree with Linus' tree
Date: Fri, 21 Jun 2019 10:05:06 +0200 [thread overview]
Message-ID: <20190621100506.16a04050.cohuck@redhat.com> (raw)
In-Reply-To: <20190621154315.0a4d5f54@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
On Fri, 21 Jun 2019 15:43:15 +1000
Stephen Rothwell <sfr@canb•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.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-06-21 8:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 5:43 linux-next: manual merge of the kvms390 tree with Linus' tree Stephen Rothwell
2019-06-21 8:05 ` Cornelia Huck [this message]
2019-06-24 17:52 ` Christian Borntraeger
2019-06-24 22:08 ` Stephen Rothwell
2019-07-08 23:53 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190621100506.16a04050.cohuck@redhat.com \
--to=cohuck@redhat$(echo .)com \
--cc=aaronlewis@google$(echo .)com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thuth@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox