From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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,
Rob Herring <rob.herring@calxeda.com>,
John Linn <John.Linn@xilinx.com>,
Michal Simek <michal.simek@xilinx.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
Date: Fri, 5 Apr 2013 15:34:53 +1100 [thread overview]
Message-ID: <20130405153453.75b76d68fe9adc6e981e02fb@canb.auug.org.au> (raw)
In-Reply-To: <20130405153335.baf29606a97b1bee415f3546@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi all,
On Fri, 5 Apr 2013 15:33:35 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-spear/spear13xx.c between commit c79e33b3e828 ("ARM:
> smp_twd: convert to use CLKSRC_OF init") from the xilinx tree and commit
> 2b9c613c4ee1 ("ARM: spear: move generic.h and pl080.h into private dir")
> from the arm-soc tree.
BTW, that xilinx tree commit has no "Signed-off-by" for the committer ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-04-05 4:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 4:33 linux-next: manual merge of the arm-soc tree with the xilinx tree Stephen Rothwell
2013-04-05 4:34 ` Stephen Rothwell [this message]
[not found] ` <CAHTX3d++6JWTKWkGOfgJj10z1Xtx325YXNQ6eMJjM8HO4q1diw@mail.gmail.com>
2013-04-05 5:58 ` Stephen Rothwell
[not found] ` <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
2013-04-05 12:09 ` Arnd Bergmann
[not found] ` <CAHTX3d+PZ=G6JYBo7Hvqe=G77udaCFJ4pD4z_sQw_FDGP-xt=A@mail.gmail.com>
2013-04-05 13:32 ` Arnd Bergmann
2013-04-05 14:14 ` Michal Simek
-- strict thread matches above, loose matches on Subject: below --
2013-01-11 3:51 Stephen Rothwell
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=20130405153453.75b76d68fe9adc6e981e02fb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=John.Linn@xilinx.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=olof@lixom.net \
--cc=rob.herring@calxeda.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 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).