From: Collin Walling <walling@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jim Mattson <jmattson@google.com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the kvm tree
Date: Wed, 15 Jul 2020 12:25:42 -0400 [thread overview]
Message-ID: <067cf82f-cc6d-968a-d1ab-53edc4e44114@linux.ibm.com> (raw)
In-Reply-To: <20200713145007.26acf3fb@canb.auug.org.au>
On 7/13/20 12:50 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> include/uapi/linux/kvm.h
>
> between commit:
>
> 1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information")
>
> from the kvm tree and commit:
>
> 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
>
> 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.
>
Much appreciated. This change is acceptable and should be properly
reflected in a header sync for QEMU (which I believe just copies the
files from the kernel?)
Thanks for the update.
--
Regards,
Collin
Stay safe and stay healthy
next prev parent reply other threads:[~2020-07-15 16:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 4:50 linux-next: manual merge of the kvms390 tree with the kvm tree Stephen Rothwell
2020-07-15 16:25 ` Collin Walling [this message]
2020-07-15 16:59 ` Christian Borntraeger
-- strict thread matches above, loose matches on Subject: below --
2015-11-20 1:47 Stephen Rothwell
2015-11-20 10:01 ` Christian Borntraeger
2015-04-07 8:41 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=067cf82f-cc6d-968a-d1ab-53edc4e44114@linux.ibm.com \
--to=walling@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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