linux-next: manual merge of the sparc tree

linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the sparc tree got a conflict in
include/asm-sparc/smp.h between commit
8691e5a8f691cc2a4fda0651e8d307aaba0e7d68 ("smp_call_function: get rid of
the unused nonatomic/retry argument") from Linus' tree and commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree.

I applied the part of the patch from Linus' tree to asm-sparc/smp_32.h.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi Dave,

On Tue, 16 Sep 2008 14:31:37 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just pushed a merge resolution to this by pulling sparc-2.6
> into sparc-next-2.6, moving the PCI config space address
> computer into psycho_common.h, and propagating the bug fix
> from sparc-2.6 into where the code lives now in psycho_common.c

Thanks for that it will get picked up tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the sparc tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Sep 2008 06:27:46 +1000

> Today's linux-next merge of the sparc tree got a conflict in
> arch/sparc64/kernel/pci_psycho.c between commit
> f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c("sparc64: Fix OOPS in
> psycho_pcierr_intr_other()") from the sparc-current tree and commit
> e6e003720fd7123482f77dcec19e930d272937fe ("sparc64: Commonize large
> portions of PSYCHO error handling") from the sparc tree.
> 
> The latter moves code that the former modifies.  So, as discsussed, I
> dropped the former fix for today as I assume you will fix it when you
> merge sparc-current.

Thanks Stephen.

I just pushed a merge resolution to this by pulling sparc-2.6
into sparc-next-2.6, moving the PCI config space address
computer into psycho_common.h, and propagating the bug fix
from sparc-2.6 into where the code lives now in psycho_common.c

linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the sparc tree got a conflict in
arch/sparc64/kernel/pci_psycho.c between commit
f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c("sparc64: Fix OOPS in
psycho_pcierr_intr_other()") from the sparc-current tree and commit
e6e003720fd7123482f77dcec19e930d272937fe ("sparc64: Commonize large
portions of PSYCHO error handling") from the sparc tree.

The latter moves code that the former modifies.  So, as discsussed, I
dropped the former fix for today as I assume you will fix it when you
merge sparc-current.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi Dave,

On Wed, 03 Sep 2008 18:17:56 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I'll pull sparc-2.6 into sparc-next-2.6 at some point to resolve
> this.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the sparc tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Sep 2008 11:17:17 +1000

> Today's linux-next merge of the sparc tree got a conflict in
> arch/sparc/kernel/of_device.c between commit
> e3c71a32915fabb095de7108c22672e457631a08 ("sparc: Fix resource flags for
> PCI children in OF device tree") from Linus' tree and commit
> 5280267c1dddb8d413595b87dc406624bb497946 ("sparc: Fix handling of LANCE
> and ESP parent nodes in of_device.c") from the sparc tree.
> 
> The former just changed the context of the latter.  I fixed it up (see
> below).

Looks good, thanks.

I'll pull sparc-2.6 into sparc-next-2.6 at some point to resolve
this.

linux-next: manual merge of the sparc tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the sparc tree got a conflict in
arch/sparc/kernel/of_device.c between commit
e3c71a32915fabb095de7108c22672e457631a08 ("sparc: Fix resource flags for
PCI children in OF device tree") from Linus' tree and commit
5280267c1dddb8d413595b87dc406624bb497946 ("sparc: Fix handling of LANCE
and ESP parent nodes in of_device.c") from the sparc tree.

The former just changed the context of the latter.  I fixed it up (see
below).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/sparc/kernel/of_device.c
index c481d45,4ef1607..0000000
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@@ -371,12 -409,8 +415,9 @@@ static void __init build_device_resourc
  
  		memcpy(addr, reg, na * 4);
  
 +		flags = bus->get_flags(reg, 0);
 +
- 		/* If the immediate parent has no ranges property to apply,
- 		 * just use a 1<->1 mapping.
- 		 */
- 		if (of_find_property(pp, "ranges", NULL) == NULL) {
+ 		if (use_1to1_mapping(pp)) {
  			result = of_read_addr(addr, na);
  			goto build_res;
  		}

Re: linux-next: manual merge of the sparc tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Jul 2008 17:39:13 +1000

> Today's linux-next merge of the sparc tree got conflicts in
> include/asm-sparc64/mmu.h, include/asm-sparc64/page.h and
> include/asm-sparc64/pgtable.h between commit
> 5cd012990ab37dbef7d84cc74feb70ef5f792a12 ("sparc64: Remove 4MB and 512K
> base page size options") from the sparc-current tree and commit
> 0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
> header files") from the sparc tree.
> 
> I applied the appropriate parts of the sparc-current commit to
> include/asm-sparc/{mmu,page,pgtable}_64.h.

Stephen, thanks for all of these sparc merge conflict reports.

I'm respinning my sparc tree tonight and that should take care of all
of the conflicts.

linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the sparc tree got conflicts in
include/asm-sparc64/mmu.h, include/asm-sparc64/page.h and
include/asm-sparc64/pgtable.h between commit
5cd012990ab37dbef7d84cc74feb70ef5f792a12 ("sparc64: Remove 4MB and 512K
base page size options") from the sparc-current tree and commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree.

I applied the appropriate parts of the sparc-current commit to
include/asm-sparc/{mmu,page,pgtable}_64.h.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi all,

On Wed, 16 Jul 2008 17:19:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the sparc tree got a conflict in
> include/asm-sparc/ide.h between commit
> 28f42f1b76ba97dbc68041c75be387b743dcf5b1 ("ide: define MAX_HWIFS in
> <linux/ide.h>") from the ide tree and commit
> 0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
> header files") from the sparc tree.
> 
> I applied the change from the ide commit to asm-sparc/ide_32.h (just
> remove three lines).

I also applied the asm-sparc64/ide.h part of the ide commit to
asm-sparc/ide_64.h

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the sparc tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the sparc tree got a conflict in
include/asm-sparc/ide.h between commit
28f42f1b76ba97dbc68041c75be387b743dcf5b1 ("ide: define MAX_HWIFS in
<linux/ide.h>") from the ide tree and commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree.

I applied the change from the ide commit to asm-sparc/ide_32.h (just
remove three lines).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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