Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 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. I haven't based on arm-soc for-next branch my arm-next branch. I just took all patches I need for zynq and done git rebase v3.5-rc5. Which caused that I have became commuter of that 4 patches and there is probably any conflict between your for-next branch and clksrc/cleanup which you have resolved in for-next branch. Ah, I see. That was actually my fault, I'm sorry for causing trouble here and then accusing you instead. And because of my rebase sha1 are different that's why Stephen had problem with it. I have changed my arm-next branch and will see on Monday if Stephen will report any problem or not. Ok, thanks! No worries. Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 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. > > > > I haven't based on arm-soc for-next branch my arm-next branch. > I just took all patches I need for zynq and done git rebase v3.5-rc5. > Which caused that I have became commuter of that 4 patches > and there is probably any conflict between your for-next branch and > clksrc/cleanup > which you have resolved in for-next branch. Ah, I see. That was actually my fault, I'm sorry for causing trouble here and then accusing you instead. > And because of my rebase sha1 are different that's why Stephen > had problem with it. > I have changed my arm-next branch and will see on Monday if Stephen > will report any problem or not. Ok, thanks! Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 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).
> >
>
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
On Friday 05 April 2013, Michal Simek wrote: Hi, 2013/4/5 Stephen Rothwell s...@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). s...@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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 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. I haven't based on arm-soc for-next branch my arm-next branch. I just took all patches I need for zynq and done git rebase v3.5-rc5. Which caused that I have became commuter of that 4 patches and there is probably any conflict between your for-next branch and clksrc/cleanup which you have resolved in for-next branch. Ah, I see. That was actually my fault, I'm sorry for causing trouble here and then accusing you instead. And because of my rebase sha1 are different that's why Stephen had problem with it. I have changed my arm-next branch and will see on Monday if Stephen will report any problem or not. Ok, thanks! Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 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. I haven't based on arm-soc for-next branch my arm-next branch. I just took all patches I need for zynq and done git rebase v3.5-rc5. Which caused that I have became commuter of that 4 patches and there is probably any conflict between your for-next branch and clksrc/cleanup which you have resolved in for-next branch. Ah, I see. That was actually my fault, I'm sorry for causing trouble here and then accusing you instead. And because of my rebase sha1 are different that's why Stephen had problem with it. I have changed my arm-next branch and will see on Monday if Stephen will report any problem or not. Ok, thanks! No worries. Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 cat-file -p c79e33b3e828c79cfedf858ef7d4df96df5fece7 tree 1e5e352eb501a2afa173989415a8b4896d4999a5 parent ab8a98cff21aedb787934e8d366c9879ad0e824c author Rob Herring 1360207067 -0600 committer Michal Simek 1365060716 +0200 ARM: smp_twd: convert to use CLKSRC_OF init Now that we have OF based init with CLKSRC_OF, convert smp_twd init function to use it and covert all callers of twd_local_timer_of_register. Signed-off-by: Rob Herring Cc: Shawn Guo Cc: Sascha Hauer Cc: Russell King Cc: Viresh Kumar Cc: Shiraz Hashim Cc: Srinidhi Kasagar Cc: John Stultz Cc: Thomas Gleixner Cc: linux-o...@vger.kernel.org Cc: spear-de...@list.st.com Reviewed-by: Stephen Warren Acked-by: Santosh Shilimkar Acked-by: Tony Lindgren Acked-by: Linus Walleij -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp3a0DxEINF4.pgp Description: PGP signature
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
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 ("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 Rothwells...@canb.auug.org.au
pgpM98677pozH.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the xilinx tree
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 Rothwells...@canb.auug.org.au
pgpKw1t5yCfIO.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the xilinx tree
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 Rothwells...@canb.auug.org.au pgpKw1t5yCfIO.pgp Description: PGP signature
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
Hi all, On Fri, 5 Apr 2013 15:33:35 +1100 Stephen Rothwell s...@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 Rothwells...@canb.auug.org.au pgpM98677pozH.pgp Description: PGP signature
Re: linux-next: manual merge of the arm-soc tree with the xilinx tree
Hi Michal, On Fri, 5 Apr 2013 07:52:34 +0200 Michal Simek mon...@monstr.eu wrote: 2013/4/5 Stephen Rothwell s...@canb.auug.org.au 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 cat-file -p c79e33b3e828c79cfedf858ef7d4df96df5fece7 tree 1e5e352eb501a2afa173989415a8b4896d4999a5 parent ab8a98cff21aedb787934e8d366c9879ad0e824c author Rob Herring rob.herr...@calxeda.com 1360207067 -0600 committer Michal Simek michal.si...@xilinx.com 1365060716 +0200 ARM: smp_twd: convert to use CLKSRC_OF init Now that we have OF based init with CLKSRC_OF, convert smp_twd init function to use it and covert all callers of twd_local_timer_of_register. Signed-off-by: Rob Herring rob.herr...@calxeda.com Cc: Shawn Guo shawn@linaro.org Cc: Sascha Hauer ker...@pengutronix.de Cc: Russell King li...@arm.linux.org.uk Cc: Viresh Kumar viresh.li...@gmail.com Cc: Shiraz Hashim shiraz.has...@st.com Cc: Srinidhi Kasagar srinidhi.kasa...@stericsson.com Cc: John Stultz johns...@us.ibm.com Cc: Thomas Gleixner t...@linutronix.de Cc: linux-o...@vger.kernel.org Cc: spear-de...@list.st.com Reviewed-by: Stephen Warren swar...@nvidia.com Acked-by: Santosh Shilimkar santosh.shilim...@ti.com Acked-by: Tony Lindgren t...@atomide.com Acked-by: Linus Walleij linus.wall...@linaro.org -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp3a0DxEINF4.pgp Description: PGP signature
linux-next: manual merge of the arm-soc tree with the xilinx tree
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 Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-zynq/common.c
index 892f65e,2ae4bce..000
--- 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.
*/
pgp8BlWwGGc6e.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the xilinx tree
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 Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-zynq/common.c
index 892f65e,2ae4bce..000
--- 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.
*/
pgp8BlWwGGc6e.pgp
Description: PGP signature
