linux-next: manual merge of the tip tree with the sparc-next tree

linux-next: manual merge of the tip tree with the sparc-next tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got conflicts in:

  arch/sparc/mm/srmmu.c

Commits

3408974d0533 sparc32: mm: Restructure sparc32 MMU page-table layout
c95be5b549d6 sparc32: mm: Change pgtable_t type to pte_t * instead of struct page *
f790d0205fd5 sparc32: mm: Fix argument checking in __srmmu_get_nocache()

from the tip tree are also in the sparc-next tree as different commits
(plus some others).

I fixed it up (I just used the sparc-next tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Sam Ravnborg]

On Mon, May 14, 2012 at 02:51:14PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/sparc/include/asm/thread_info_32.h between commit e7b7e0c35655
> ("sparc32: drop btfixup for alloc_thread_info_node/free_thread_info")
> from the sparc-next tree and commit f5e10287367d ("task_allocator: Use
> config switches instead of magic defines") from the tip tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Hi Stephen.

The right fix would be to drop the define _and_ delete the local
implementation of alloc_thread_info_node() as the generic version
can be used.

But if this builds I can always revist this after the merge window,
so no need for you to do more.

	Sam

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 May 2012 14:51:14 +1000

> Today's linux-next merge of the tip tree got a conflict in
> arch/sparc/include/asm/thread_info_32.h between commit e7b7e0c35655
> ("sparc32: drop btfixup for alloc_thread_info_node/free_thread_info")
> from the sparc-next tree and commit f5e10287367d ("task_allocator: Use
> config switches instead of magic defines") from the tip tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks Stephen, you in fact probably will need to carry this one.

linux-next: manual merge of the tip tree with the sparc-next tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/sparc/include/asm/thread_info_32.h between commit e7b7e0c35655
("sparc32: drop btfixup for alloc_thread_info_node/free_thread_info")
from the sparc-next tree and commit f5e10287367d ("task_allocator: Use
config switches instead of magic defines") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/sparc/include/asm/thread_info_32.h
index 74316de,b29498d..0000000
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@@ -80,10 -80,11 +80,8 @@@ register struct thread_info *current_th
   */
  #define THREAD_INFO_ORDER  1
  
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
 -BTFIXUPDEF_CALL(struct thread_info *, alloc_thread_info_node, int)
 -#define alloc_thread_info_node(tsk, node) BTFIXUP_CALL(alloc_thread_info_node)(node)
 -
 -BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
 -#define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti)
 +struct thread_info * alloc_thread_info_node(struct task_struct *tsk, int node);
 +void free_thread_info(struct thread_info *);
  
  #endif /* __ASSEMBLY__ */
  

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