linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the mvebu tree with the arm tree
@ 2014-04-28  1:33 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-04-28  1:33 UTC (permalink / raw)
  To: Jason Cooper, andrew, linux-arm-kernel, Russell King
  Cc: linux-next, linux-kernel, Gregory CLEMENT

[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/board-v7.c between commit b21770945fa2 ("ARM: l2c:
remove unnecessary UL-suffix to mask values") from the arm tree and
commit 2865b82e9e19 ("ARM: mvebu: remove unnecessary ifdef around
l2x0_of_init") from the mvebu 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-mvebu/board-v7.c
index c6bd79f64744,bc0283f0dd88..000000000000
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@@ -57,11 -75,10 +75,10 @@@ static void __init mvebu_timer_and_clk_
  {
  	of_clk_init(NULL);
  	clocksource_of_init();
+ 	mvebu_scu_enable();
  	coherency_init();
- 	BUG_ON(mvebu_mbus_dt_init());
- #ifdef CONFIG_CACHE_L2X0
+ 	BUG_ON(mvebu_mbus_dt_init(coherency_available()));
 -	l2x0_of_init(0, ~0UL);
 +	l2x0_of_init(0, ~0);
- #endif
  
  	if (of_machine_is_compatible("marvell,armada375"))
  		hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* linux-next: manual merge of the mvebu tree with the arm tree
@ 2014-07-17  1:39 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-07-17  1:39 UTC (permalink / raw)
  To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel, Russell King
  Cc: linux-next, linux-kernel, Thomas Petazzoni

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/headsmp-a9.S between commit e77a0969a99e ("ARM:
convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree
and commit 435b4642e49f ("ARM: mvebu: use the common function for
Armada 375 SMP workaround") from the mvebu tree.

I fixed it up (the latter removed the code modified by the former) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the mvebu tree with the arm tree
  2014-07-07  1:28 Stephen Rothwell
@ 2014-07-07  8:22 ` Russell King - ARM Linux
  0 siblings, 0 replies; 4+ messages in thread
From: Russell King - ARM Linux @ 2014-07-07  8:22 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jason Cooper, andrew, gregory.clement, linux-arm-kernel,
	linux-next, linux-kernel, Thomas Petazzoni

On Mon, Jul 07, 2014 at 11:28:53AM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm/mach-mvebu/headsmp-a9.S
> index 7c91ddb6f1f7,da5bb292b91c..000000000000
> --- a/arch/arm/mach-mvebu/headsmp-a9.S
> +++ b/arch/arm/mach-mvebu/headsmp-a9.S
> @@@ -14,8 -14,9 +14,10 @@@
>   
>   #include <linux/linkage.h>
>   #include <linux/init.h>
>  +#include <asm/assembler.h>
>   
> + #include <asm/assembler.h>
> + 

Obviously not quite correct - this looks like an automatic merge, something
that will have to be kept an eye on during the proper merge window.

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* linux-next: manual merge of the mvebu tree with the arm tree
@ 2014-07-07  1:28 Stephen Rothwell
  2014-07-07  8:22 ` Russell King - ARM Linux
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2014-07-07  1:28 UTC (permalink / raw)
  To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel, Russell King
  Cc: linux-next, linux-kernel, Thomas Petazzoni

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/headsmp-a9.S between commit 8a3a9dd50dd9 ("ARM:
convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree
and commit 0e2be4c1121a ("ARM: mvebu: fix SMP boot for Armada 38x and
Armada 375 Z1 in big endian") from the mvebu 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-mvebu/headsmp-a9.S
index 7c91ddb6f1f7,da5bb292b91c..000000000000
--- a/arch/arm/mach-mvebu/headsmp-a9.S
+++ b/arch/arm/mach-mvebu/headsmp-a9.S
@@@ -14,8 -14,9 +14,10 @@@
  
  #include <linux/linkage.h>
  #include <linux/init.h>
 +#include <asm/assembler.h>
  
+ #include <asm/assembler.h>
+ 
  	__CPUINIT
  #define CPU_RESUME_ADDR_REG 0xf10182d4
  
@@@ -23,9 -24,13 +25,13 @@@
  .global armada_375_smp_cpu1_enable_code_end
  
  armada_375_smp_cpu1_enable_code_start:
- 	ldr     r0, [pc, #4]
+ ARM_BE8(setend	be)
+ 	adr     r0, 1f
+ 	ldr	r0, [r0]
  	ldr     r1, [r0]
+ ARM_BE8(rev	r1, r1)
 -	mov     pc, r1
 +	ret     r1
+ 1:
  	.word   CPU_RESUME_ADDR_REG
  armada_375_smp_cpu1_enable_code_end:
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-07-17  1:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-28  1:33 linux-next: manual merge of the mvebu tree with the arm tree Stephen Rothwell
2014-07-07  1:28 Stephen Rothwell
2014-07-07  8:22 ` Russell King - ARM Linux
2014-07-17  1:39 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).