linux-next: manual merge of the kspp tree with the mm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  scripts/Makefile.lib
  scripts/Makefile.ubsan

between commit:

  1a75e5856b3b ("ubsan: reintroduce signed overflow sanitizer")

from the mm-unstable branch of the mm tree and commit:

  557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")

from the kspp tree.

So, the conflicts looked like this:

scripts/Makefile.lib:

ifeq ($(CONFIG_UBSAN),y)
_c_flags += $(if $(patsubst n%,, \
		$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
		$(CFLAGS_UBSAN))
_c_flags += $(if $(patsubst n%,, \
<<<<<<< HEAD
		$(UBSAN_WRAP_SIGNED_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_WRAP_SIGNED)$(UBSAN_SANITIZE)y), \
		$(CFLAGS_UBSAN_WRAP_SIGNED))
=======
		$(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
		$(CFLAGS_UBSAN_SIGNED_WRAP))
>>>>>>> kspp/for-next/kspp
endif

scripts/Makefile.ubsan:

export CFLAGS_UBSAN := $(ubsan-cflags-y)

<<<<<<< HEAD
ubsan-wrap-signed-cflags-$(CONFIG_UBSAN_SIGNED_WRAP)     += -fsanitize=signed-integer-overflow
export CFLAGS_UBSAN_WRAP_SIGNED := $(ubsan-wrap-signed-cflags-y)
=======
ubsan-signed-wrap-cflags-$(CONFIG_UBSAN_SIGNED_WRAP)     += -fsanitize=signed-integer-overflow
export CFLAGS_UBSAN_SIGNED_WRAP := $(ubsan-signed-wrap-cflags-y)
>>>>>>> kspp/for-next/kspp

I fixed it up (I just used the kspp tree version (arbitrarily)) 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 --]