Re: linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-04-05 Thread Michal Simek
On 04/05/2013 03:32 PM, Arnd Bergmann wrote: On Friday 05 April 2013, Michal Simek wrote: 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 stab

Re: linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-04-05 Thread Arnd Bergmann
On Friday 05 April 2013, Michal Simek wrote: > > > 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 neve

Re: linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-04-05 Thread Arnd Bergmann
On Friday 05 April 2013, Michal Simek wrote: > Hi, > > 2013/4/5 Stephen Rothwell > > > 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 xilin

Re: linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-04-04 Thread Stephen Rothwell
Hi Michal, On Fri, 5 Apr 2013 07:52:34 +0200 Michal Simek wrote: > > 2013/4/5 Stephen Rothwell > > > > BTW, that xilinx tree commit has no "Signed-off-by" for the committer ... > > Interesting that you can't see Rob's Signed-off-by line. Rob was the author, you were the committer ... $ git ca

Re: linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-04-04 Thread Stephen Rothwell
Hi all, On Fri, 5 Apr 2013 15:33:35 +1100 Stephen Rothwell 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 ("AR

linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-04-04 Thread Stephen Rothwell
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-s

linux-next: manual merge of the arm-soc tree with the xilinx tree

2013-01-10 Thread Stephen Rothwell
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