From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
Simon Horman <horms+renesas@verge.net.au>,
Sudeep Holla <sudeep.holla@arm.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Tue, 28 Jul 2015 12:20:25 +1000 [thread overview]
Message-ID: <20150728122025.6b2cdbc8@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm/mach-shmobile/intc-sh73a0.c
between commit:
30f8925a57d8 ("ARM: shmobile: Remove legacy board code for KZM-A9-GT")
from the arm-soc tree and commit:
0d3f2c92e004 ("irqchip/gic: Remove redundant gic_set_irqchip_flags")
from the tip tree.
I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-07-28 2:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 2:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 1:21 Stephen Rothwell
2018-10-08 2:32 Stephen Rothwell
2018-03-19 3:06 Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-03-13 3:11 Stephen Rothwell
2014-09-26 6:25 Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-03-28 3:50 Stephen Rothwell
2014-03-28 3:47 Stephen Rothwell
2014-03-28 3:39 Stephen Rothwell
2014-03-20 3:36 Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell
2014-03-17 5:37 Stephen Rothwell
2014-03-17 5:35 Stephen Rothwell
2014-03-17 16:41 ` Sören Brinkmann
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=20150728122025.6b2cdbc8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=olof@lixom.net \
--cc=peterz@infradead.org \
--cc=sudeep.holla@arm.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®