* linux-next: manual merge of the arm-soc tree with the xilinx tree
@ 2013-04-05 4:33 Stephen Rothwell
2013-04-05 4:34 ` Stephen Rothwell
[not found] ` <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2013-04-05 4:33 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Rob Herring, John Linn, Michal Simek
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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
[not found] ` <CAHTX3d++6JWTKWkGOfgJj10z1Xtx325YXNQ6eMJjM8HO4q1diw@mail.gmail.com>
[not found] ` <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>
1 sibling, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2013-04-05 4:34 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Rob Herring, John Linn, Michal Simek
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <CAHTX3d+NK7b3RVMASZ4BARs1kHeVKGgxNwKTjAeiNB+44TPsFg@mail.gmail.com>]
* Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
[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>
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2013-04-05 12:09 UTC (permalink / raw)
To: Michal Simek
Cc: Stephen Rothwell, linux-kernel, Rob Herring, linux-next,
Olof Johansson, John Linn, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the arm-soc tree with the xilinx tree
@ 2013-01-11 3:51 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2013-01-11 3:51 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Soren Brinkmann, John Linn, Stephen Warren
[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-zynq/common.c between commit 453708c6da9b ("arm: zynq:
timer: Replace PSS through PS") from the xilinx tree and commit
6bb27d7349db ("ARM: delete struct sys_timer") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-zynq/common.c
index 892f65e,2ae4bce..0000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -90,16 -90,9 +90,9 @@@ static void __init xilinx_zynq_timer_in
xilinx_zynq_clocks_init(slcr);
- xttcpss_timer_init();
+ xttcps_timer_init();
}
- /*
- * Instantiate and initialize the system timer structure
- */
- static struct sys_timer xttcps_sys_timer = {
- .init = xilinx_zynq_timer_init,
- };
-
/**
* xilinx_map_io() - Create memory mappings needed for early I/O.
*/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-04-05 14:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
[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
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).