From: Marc Zyngier <marc.zyngier@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Christoffer Dall <cdall@cs.columbia.edu>,
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, Julien Grall <julien.grall@arm.com>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the tip tree
Date: Wed, 4 May 2016 08:58:26 +0100 [thread overview]
Message-ID: <5729ABA2.5040403@arm.com> (raw)
In-Reply-To: <20160504134918.11edacf7@canb.auug.org.au>
On 04/05/16 04:49, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> drivers/irqchip/irq-gic-v3.c
>
> between commit:
>
> e3825ba1af3a ("irqchip/gic-v3: Add support for partitioned PPIs")
>
> from the tip tree and commit:
>
> 1839e576968f ("irqchip/gic-v3: Parse and export virtual GIC information")
>
> from the kvm-arm 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.
Looks good, thanks Stephen.
M.
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2016-05-04 7:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 3:49 linux-next: manual merge of the kvm-arm tree with the tip tree Stephen Rothwell
2016-05-04 7:58 ` Marc Zyngier [this message]
2016-07-18 6:09 Stephen Rothwell
2016-07-20 5:21 Stephen Rothwell
2016-07-20 5:28 Stephen Rothwell
2016-09-27 3:46 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=5729ABA2.5040403@arm.com \
--to=marc.zyngier@arm.com \
--cc=cdall@cs.columbia.edu \
--cc=hpa@zytor.com \
--cc=julien.grall@arm.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--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.