From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Christoffer Dall" <cdall@cs.columbia.edu>,
"Marc Zyngier" <marc.zyngier@arm.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@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>,
Peter Xu <peterx@redhat.com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Wed, 25 Mar 2020 14:23:02 +1100 [thread overview]
Message-ID: <20200325142302.75d5c4be@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm/kvm/coproc.c
between commit:
4d395762599d ("KVM: Remove unnecessary asm/kvm_host.h includes")
from the kvm tree and commit:
541ad0150ca4 ("arm: Remove 32bit KVM host support")
from the kvm-arm tree.
I fixed it up (I removed the 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-25 3:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 3:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 3:06 linux-next: manual merge of the kvm-arm tree with the kvm tree Stephen Rothwell
2023-03-31 2:26 Stephen Rothwell
2022-12-01 2:16 Stephen Rothwell
2022-12-01 15:23 ` Marc Zyngier
2022-12-01 1:09 Stephen Rothwell
2022-12-01 0:57 Stephen Rothwell
2022-12-01 0:36 Stephen Rothwell
2022-12-01 0:24 Stephen Rothwell
2022-07-18 5:19 Stephen Rothwell
2022-05-05 4:47 Stephen Rothwell
2021-12-17 4:19 Stephen Rothwell
2021-12-09 22:01 broonie
2021-06-25 5:24 Stephen Rothwell
2021-06-25 5:20 Stephen Rothwell
2021-06-25 5:15 Stephen Rothwell
2021-06-23 5:53 Stephen Rothwell
2021-06-22 5:31 Stephen Rothwell
2021-04-22 4:43 Stephen Rothwell
2021-04-22 4:39 Stephen Rothwell
2020-07-13 4:40 Stephen Rothwell
2020-08-09 8:55 ` Stephen Rothwell
2020-07-13 4:39 Stephen Rothwell
2020-08-09 8:54 ` Stephen Rothwell
2018-10-18 2:46 Stephen Rothwell
2017-04-10 3:52 Stephen Rothwell
2017-04-10 6:26 ` Christoffer Dall
2016-07-24 6:04 Stephen Rothwell
2016-07-24 6:04 ` Stephen Rothwell
2016-07-24 5:59 Stephen Rothwell
2016-07-24 5:59 ` Stephen Rothwell
2016-07-20 5:27 Stephen Rothwell
2016-07-20 5:27 ` Stephen Rothwell
2015-10-16 3:53 Stephen Rothwell
2015-10-16 3:53 ` Stephen Rothwell
2015-10-16 4:20 ` Wu, Feng
2014-11-26 6:19 Stephen Rothwell
2014-11-26 11:39 ` Christoffer Dall
2014-09-25 5:32 Stephen Rothwell
2014-09-18 3:52 Stephen Rothwell
2014-09-18 15:13 ` Marc Zyngier
2014-09-18 15:13 ` Marc Zyngier
2014-09-08 6:04 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=20200325142302.75d5c4be@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cdall@cs.columbia.edu \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=rkrcmar@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.