From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoffer Dall <cdall@cs.columbia.edu>,
Marc Zyngier <marc.zyngier@arm.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Richard Cochran <rcochran@linutronix.de>,
Anna-Maria Gleixner <anna-maria@linutronix.de>
Subject: linux-next: manual merge of the kvm-arm tree with the tip tree
Date: Mon, 18 Jul 2016 16:09:36 +1000 [thread overview]
Message-ID: <20160718160936.7bd0c4c9@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/arm/vgic.c
between commit:
42ec50b5f257 ("arm/kvm/vgic: Convert to hotplug state machine")
from the tip tree and commit:
50926d82fa27 ("KVM: arm/arm64: The GIC is dead, long live the GIC")
from the kvm-arm tree.
I fixed it up (the latter removed the file, so I did that -
CPUHP_AP_KVM_ARM_VGIC_STARTING should probably be removed as well) 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
next reply other threads:[~2016-07-18 6:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-18 6:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-09-27 3:46 linux-next: manual merge of the kvm-arm tree with the tip tree Stephen Rothwell
2016-07-20 5:28 Stephen Rothwell
2016-07-20 5:21 Stephen Rothwell
2016-05-04 3:49 Stephen Rothwell
2016-05-04 7:58 ` Marc Zyngier
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=20160718160936.7bd0c4c9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anna-maria@linutronix.de \
--cc=cdall@cs.columbia.edu \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rcochran@linutronix.de \
--cc=tglx@linutronix.de \
/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.