From: Kukjin Kim <kgene.kim@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Daniel Lezcano <daniel.lezcano@linaro.org>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kukjin Kim <kgene.kim@samsung.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Fri, 26 Apr 2013 01:15:47 +0900 [thread overview]
Message-ID: <517956B3.2000201@samsung.com> (raw)
In-Reply-To: <20130424165417.5e2b74a01728d307e454750f@canb.auug.org.au>
On 04/24/13 15:54, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 ("cpuidle:
> remove en_core_tk_irqen flag") from the pm tree and commit 2eb89f893e44
> ("ARM: EXYNOS: factor out the idle states") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks OK to me, thanks.
- Kukjin
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Fri, 26 Apr 2013 01:15:47 +0900 [thread overview]
Message-ID: <517956B3.2000201@samsung.com> (raw)
In-Reply-To: <20130424165417.5e2b74a01728d307e454750f@canb.auug.org.au>
On 04/24/13 15:54, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 ("cpuidle:
> remove en_core_tk_irqen flag") from the pm tree and commit 2eb89f893e44
> ("ARM: EXYNOS: factor out the idle states") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks OK to me, thanks.
- Kukjin
next prev parent reply other threads:[~2013-04-25 16:15 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-24 6:54 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2013-04-24 6:54 ` Stephen Rothwell
2013-04-24 6:54 ` Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim [this message]
2013-04-25 16:15 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2013-10-29 8:00 Stephen Rothwell
2013-10-29 8:00 ` Stephen Rothwell
2013-10-29 8:00 ` Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki
2013-10-29 12:08 ` Rafael J. Wysocki
2013-08-29 8:04 Stephen Rothwell
2013-08-29 8:04 ` Stephen Rothwell
2013-08-29 8:04 ` Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson
2013-08-29 17:57 ` Olof Johansson
2013-09-02 18:09 ` Lorenzo Pieralisi
2013-09-02 18:09 ` Lorenzo Pieralisi
2013-09-09 17:22 ` Kevin Hilman
2013-09-09 17:22 ` Kevin Hilman
2013-09-10 8:59 ` Lorenzo Pieralisi
2013-09-10 8:59 ` Lorenzo Pieralisi
2013-08-27 8:33 Stephen Rothwell
2013-08-27 8:33 ` Stephen Rothwell
2013-08-27 8:33 ` Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman
2013-08-27 15:30 ` Kevin Hilman
2013-08-27 15:30 ` Kevin Hilman
2013-04-10 7:17 Stephen Rothwell
2013-04-10 7:17 ` Stephen Rothwell
2013-04-10 7:17 ` Stephen Rothwell
2013-04-10 8:36 ` Kukjin Kim
2013-04-10 8:36 ` Kukjin Kim
2013-04-11 8:37 ` Olof Johansson
2013-04-11 8:37 ` Olof Johansson
2013-04-19 10:59 ` Kukjin Kim
2013-04-19 10:59 ` Kukjin Kim
2012-09-24 9:21 Stephen Rothwell
2012-09-24 9:21 ` Stephen Rothwell
2012-09-24 9:21 ` Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson
2012-09-24 17:02 ` Olof Johansson
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=517956B3.2000201@samsung.com \
--to=kgene.kim@samsung.com \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/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.