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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgp00000.pgp
Description: PGP signature