linux-next: manual merge of the kbuild tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kbuild tree got a conflict in:

  arch/mips/kernel/syscalls/Makefile

between commit:

  ccb21774863a ("MIPS: UAPI: unexport unistd_nr_{n32,n64,o32}.h")

from Linus' tree and commit:

  865fa29f7dd1 ("arch: syscalls: add missing FORCE and fix 'targets' to make if_changed work")

from the kbuild tree.

I fixed it up (see below) 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

diff --cc arch/mips/kernel/syscalls/Makefile
index a1ce8b7dbcfa,ed22b711ccb7..000000000000
--- a/arch/mips/kernel/syscalls/Makefile
+++ b/arch/mips/kernel/syscalls/Makefile
@@@ -44,17 -44,17 +44,17 @@@ $(uapi)/unistd_o32.h: $(syscallo32) $(s
  
  sysnr_pfx_unistd_nr_n32 := N32
  sysnr_offset_unistd_nr_n32 := 6000
- $(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr)
 -$(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE
++$(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE
  	$(call if_changed,sysnr)
  
  sysnr_pfx_unistd_nr_n64 := 64
  sysnr_offset_unistd_nr_n64 := 5000
- $(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr)
 -$(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE
++$(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE
  	$(call if_changed,sysnr)
  
  sysnr_pfx_unistd_nr_o32 := O32
  sysnr_offset_unistd_nr_o32 := 4000
- $(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr)
 -$(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE
++$(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE
  	$(call if_changed,sysnr)
  
  systbl_abi_syscall_table_32_o32 := 32_o32
@@@ -83,14 -86,12 +83,15 @@@ uapisyshdr-y		+= unistd_n32.h			
  kapisyshdr-y		+= syscall_table_32_o32.h	\
  			   syscall_table_64_n32.h	\
  			   syscall_table_64_n64.h	\
 -			   syscall_table_64_o32.h
 +			   syscall_table_64_o32.h	\
 +			   unistd_nr_n32.h		\
 +			   unistd_nr_n64.h		\
 +			   unistd_nr_o32.h
  
- targets	+= $(uapisyshdr-y) $(kapisyshdr-y)
+ uapisyshdr-y	:= $(addprefix $(uapi)/, $(uapisyshdr-y))
+ kapisyshdr-y	:= $(addprefix $(kapi)/, $(kapisyshdr-y))
+ targets		+= $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
  
  PHONY += all
- all: $(addprefix $(uapi)/,$(uapisyshdr-y))
- all: $(addprefix $(kapi)/,$(kapisyshdr-y))
+ all: $(uapisyshdr-y) $(kapisyshdr-y)
  	@:

Attachment: pgpMM_cK2wS_V.pgp
Description: OpenPGP digital signature