From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chanwoo Choi <cw00.choi@samsung•com>,
Kukjin Kim <kgene@kernel•org>,
Kyungmin Park <kyungmin.park@samsung•com>,
Marc Zyngier <marc.zyngier@arm•com>
Subject: linux-next: manual merge of the irqchip tree with Linus' tree
Date: Mon, 16 Mar 2015 14:47:27 +1100 [thread overview]
Message-ID: <20150316144727.488070cb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
Hi Jason,
Today's linux-next merge of the irqchip tree got a conflict in
arch/arm/mach-exynos/suspend.c between commit ace283a04a4a ("ARM:
EXYNOS: Fix wrong hwirq of RTC interrupt for Exynos3250 SoC") from
Linus' tree and commit be42c9ea7b5f ("ARM: exynos4/5: convert pmu
wakeup to stacked domains") from the irqchip tree.
I fixed it up (I just randomly chose to use the irqchip tree version)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-16 3:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 3:47 Stephen Rothwell [this message]
2015-03-16 8:47 ` linux-next: manual merge of the irqchip tree with Linus' tree Marc Zyngier
2015-03-18 17:52 ` Jason Cooper
2015-03-19 14:19 ` Marc Zyngier
2015-04-13 9:18 ` Geert Uytterhoeven
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=20150316144727.488070cb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cw00.choi@samsung$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=kgene@kernel$(echo .)org \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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