linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Alexander Lobakin <alobakin@pm.me>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Subject: linux-next: manual merge of the kbuild tree with Linus' tree
Date: Tue, 23 Feb 2021 09:24:58 +1100	[thread overview]
Message-ID: <20210223092458.38bf35bb@canb.auug.org.au> (raw)

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

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-02-22 22:25 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-22 22:24 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-06 18:16 linux-next: manual merge of the kbuild tree with Linus' tree Stephen Rothwell
2022-05-27  0:08 Stephen Rothwell
2022-04-03 22:09 Stephen Rothwell
2021-04-26 23:02 Stephen Rothwell
2020-06-04 22:59 Stephen Rothwell
2019-05-01 22:46 Stephen Rothwell
2017-05-02 22:14 Stephen Rothwell
2016-09-12  1:32 Stephen Rothwell
2016-09-12  2:53 ` Nicholas Piggin
2016-09-12  9:03   ` Michal Marek
2016-09-12 23:39     ` Stephen Rothwell
2016-09-13  4:02       ` Stephen Rothwell
2016-09-13  4:09         ` Nicholas Piggin
2016-09-13  7:48         ` Arnd Bergmann
2016-09-13  9:12           ` Nicholas Piggin
2016-07-28  1:50 Stephen Rothwell
2015-07-02  0:30 Stephen Rothwell
2015-07-02  6:47 ` Geert Uytterhoeven
2015-07-02  7:17   ` Michal Marek
2015-07-02  9:18     ` Geert Uytterhoeven
2015-07-02 19:53       ` Michal Marek
2015-07-03 11:56         ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210223092458.38bf35bb@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alobakin@pm.me \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=tsbogend@alpha.franken.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).