From: Olof Johansson <olof@lixom.net>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Mon, 24 Sep 2012 10:02:40 -0700 [thread overview]
Message-ID: <CAOesGMgP0rSXBruLNtqfOEzPAbRdbfOmEa4K+qZ++4GzZ4yNXw@mail.gmail.com> (raw)
In-Reply-To: <20120924192154.2aab0ae61dea89722bbcb974@canb.auug.org.au>
Hi,
On Mon, Sep 24, 2012 at 2:21 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-shmobile/include/mach/common.h between commit 35f2b0bd5911
> ("ARM: shmobile: Move definition of shmobile_init_late() to header") from
> the pm tree and commit a62580e58065 ("ARM: SoC: convert shmobile SMP to
> SMP operations") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hmm.
Rafael, the shmobile SoC-specific code in your tree looks like it
should have been merged through arm-soc? That way we could have
resolved the conflicts locally without having it spill out into other
trees (and thus seen by both sfr and Linus when the branches goes up
to him).
-Olof
next prev parent reply other threads:[~2012-09-24 17:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 9:21 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson [this message]
2013-04-10 7:17 Stephen Rothwell
2013-04-10 8:36 ` Kukjin Kim
2013-04-11 8:37 ` Olof Johansson
2013-04-19 10:59 ` Kukjin Kim
2013-04-24 6:54 Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2013-08-27 8:33 Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman
2013-08-29 8:04 Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson
2013-09-02 18:09 ` Lorenzo Pieralisi
2013-09-09 17:22 ` Kevin Hilman
2013-09-10 8:59 ` Lorenzo Pieralisi
2013-10-29 8:00 Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki
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=CAOesGMgP0rSXBruLNtqfOEzPAbRdbfOmEa4K+qZ++4GzZ4yNXw@mail.gmail.com \
--to=olof@lixom.net \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).