From: Arnd Bergmann <arnd@arndb.de>
To: Michal Simek <monstr@monstr.eu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
John Linn <John.Linn@xilinx.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
Date: Fri, 5 Apr 2013 14:09:37 +0200 [thread overview]
Message-ID: <201304051409.37708.arnd@arndb.de> (raw)
In-Reply-To: <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
On Friday 05 April 2013, Michal Simek wrote:
> Hi,
>
> 2013/4/5 Stephen Rothwell <sfr@canb.auug.org.au>
>
> > Hi all,
> >
> > 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.
> >
> > I fixed it up (just used the arm-soc tree version) and can carry the fix
> > as necessary (no action is required).
> > <sfr@canb.auug.org.au>
>
>
> Interesting. I rebased my arm-next branch based on 3.9-rc5
> with some Rob's + one Arnd patch from arm-soc - clksrc/cleanup branch.
>
> I will fix my arm-next branch.
The for-next branch in arm-soc is not stable, you should never base
/anything/ on it. If you depend on some stable branch, that is in arm-soc,
then use just that branch, not one of the next/* branches or for-next.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the xilinx tree
Date: Fri, 5 Apr 2013 14:09:37 +0200 [thread overview]
Message-ID: <201304051409.37708.arnd@arndb.de> (raw)
In-Reply-To: <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
On Friday 05 April 2013, Michal Simek wrote:
> Hi,
>
> 2013/4/5 Stephen Rothwell <sfr@canb.auug.org.au>
>
> > Hi all,
> >
> > 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.
> >
> > I fixed it up (just used the arm-soc tree version) and can carry the fix
> > as necessary (no action is required).
> > <sfr@canb.auug.org.au>
>
>
> Interesting. I rebased my arm-next branch based on 3.9-rc5
> with some Rob's + one Arnd patch from arm-soc - clksrc/cleanup branch.
>
> I will fix my arm-next branch.
The for-next branch in arm-soc is not stable, you should never base
/anything/ on it. If you depend on some stable branch, that is in arm-soc,
then use just that branch, not one of the next/* branches or for-next.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Michal Simek <monstr@monstr.eu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
John Linn <John.Linn@xilinx.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
Date: Fri, 5 Apr 2013 14:09:37 +0200 [thread overview]
Message-ID: <201304051409.37708.arnd@arndb.de> (raw)
In-Reply-To: <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
On Friday 05 April 2013, Michal Simek wrote:
> Hi,
>
> 2013/4/5 Stephen Rothwell <sfr@canb.auug.org.au>
>
> > Hi all,
> >
> > 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.
> >
> > I fixed it up (just used the arm-soc tree version) and can carry the fix
> > as necessary (no action is required).
> > <sfr@canb.auug.org.au>
>
>
> Interesting. I rebased my arm-next branch based on 3.9-rc5
> with some Rob's + one Arnd patch from arm-soc - clksrc/cleanup branch.
>
> I will fix my arm-next branch.
The for-next branch in arm-soc is not stable, you should never base
/anything/ on it. If you depend on some stable branch, that is in arm-soc,
then use just that branch, not one of the next/* branches or for-next.
Arnd
next prev parent reply other threads:[~2013-04-05 12:09 UTC|newest]
Thread overview: 22+ 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:33 ` Stephen Rothwell
2013-04-05 4:33 ` Stephen Rothwell
2013-04-05 4:34 ` Stephen Rothwell
2013-04-05 4:34 ` Stephen Rothwell
2013-04-05 4:34 ` Stephen Rothwell
[not found] ` <CAHTX3d++6JWTKWkGOfgJj10z1Xtx325YXNQ6eMJjM8HO4q1diw@mail.gmail.com>
2013-04-05 5:58 ` Stephen Rothwell
2013-04-05 5:58 ` Stephen Rothwell
2013-04-05 4:39 ` Stephen Rothwell
[not found] ` <CAHTX3d+rpF4D+GiB7nipE3m=yYesyZE4aj+STrpmLccHGb16JA@mail.gmail.com>
2013-04-05 6:05 ` Stephen Rothwell
[not found] ` <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
2013-04-05 12:09 ` Arnd Bergmann [this message]
2013-04-05 12:09 ` Arnd Bergmann
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 13:32 ` Arnd Bergmann
2013-04-05 13:32 ` Arnd Bergmann
2013-04-05 14:14 ` Michal Simek
2013-04-05 14:14 ` Michal Simek
2013-04-05 14:14 ` Michal Simek
-- strict thread matches above, loose matches on Subject: below --
2013-01-11 3:51 Stephen Rothwell
2013-01-11 3:51 ` Stephen Rothwell
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=201304051409.37708.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=John.Linn@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=monstr@monstr.eu \
--cc=olof@lixom.net \
--cc=rob.herring@calxeda.com \
--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.