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

From: David Miller <[email-masked]>
Date: Thu, 17 Jul 2008 23:07:29 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
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.