From: Kevin Hilman <khilman@linaro.org>
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, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Tue, 27 Aug 2013 08:30:32 -0700 [thread overview]
Message-ID: <87wqn7w3qf.fsf@linaro.org> (raw)
In-Reply-To: <20130827183313.aa7d51c6dd0b21cd8168aa35@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 27 Aug 2013 18:33:13 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 ("ARM: mvebu:
> remove device tree parsing for cpu nodes") from the tree and commit
> 994c8c94b419 ("ARM: mvebu: Remove the harcoded BootROM window
> allocation") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks correct, thanks.
Kevin (for arm-soc folks)
WARNING: multiple messages have this Message-ID (diff)
From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Tue, 27 Aug 2013 08:30:32 -0700 [thread overview]
Message-ID: <87wqn7w3qf.fsf@linaro.org> (raw)
In-Reply-To: <20130827183313.aa7d51c6dd0b21cd8168aa35@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 27 Aug 2013 18:33:13 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 ("ARM: mvebu:
> remove device tree parsing for cpu nodes") from the tree and commit
> 994c8c94b419 ("ARM: mvebu: Remove the harcoded BootROM window
> allocation") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks correct, thanks.
Kevin (for arm-soc folks)
WARNING: multiple messages have this Message-ID (diff)
From: Kevin Hilman <khilman@linaro.org>
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>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Tue, 27 Aug 2013 08:30:32 -0700 [thread overview]
Message-ID: <87wqn7w3qf.fsf@linaro.org> (raw)
In-Reply-To: <20130827183313.aa7d51c6dd0b21cd8168aa35@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 27 Aug 2013 18:33:13 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 ("ARM: mvebu:
> remove device tree parsing for cpu nodes") from the tree and commit
> 994c8c94b419 ("ARM: mvebu: Remove the harcoded BootROM window
> allocation") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks correct, thanks.
Kevin (for arm-soc folks)
next prev parent reply other threads:[~2013-08-27 15:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 8:33 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2013-08-27 8:33 ` Stephen Rothwell
2013-08-27 8:33 ` Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman [this message]
2013-08-27 15:30 ` Kevin Hilman
2013-08-27 15:30 ` Kevin Hilman
-- 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-04-24 6:54 Stephen Rothwell
2013-04-24 6:54 ` Stephen Rothwell
2013-04-24 6:54 ` Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2013-04-25 16:15 ` Kukjin Kim
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=87wqn7w3qf.fsf@linaro.org \
--to=khilman@linaro.org \
--cc=arnd@arndb.de \
--cc=ezequiel.garcia@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
--cc=sudeep.karkadanagesha@arm.com \
/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.