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

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

[Stephen Rothwell]

[-- 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 --]

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

[Andrew Morton]

On Thu, 22 Feb 2024 16:41:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 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.

Thanks, I'll drop the mm.git copy.

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

[Stephen Rothwell]

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

Hi all,

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

  include/linux/string_choices.h

between commit:

  533f2ca2a8a2 ("lib/string_choices: add str_true_false()/str_false_true() helper")

from the mm-nonmm-unstable branch of the mm tree and commits:

  a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
  f5c1ca3a15fd ("string_choices: Add wrapper for str_down_up()")

from the kspp 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 include/linux/string_choices.h
index 4a2432313b8e,1320bcdcb89c..000000000000
--- a/include/linux/string_choices.h
+++ b/include/linux/string_choices.h
@@@ -42,12 -42,12 +42,18 @@@ static inline const char *str_yes_no(bo
  	return v ? "yes" : "no";
  }
  
 +static inline const char *str_true_false(bool v)
 +{
 +	return v ? "true" : "false";
 +}
 +#define str_false_true(v)		str_true_false(!(v))
 +
+ static inline const char *str_up_down(bool v)
+ {
+ 	return v ? "up" : "down";
+ }
+ #define str_down_up(v)		str_up_down(!(v))
+ 
  /**
   * str_plural - Return the simple pluralization based on English counts
   * @num: Number used for deciding pluralization

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

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

[Hongbo Li]

On 2024/8/29 13:31, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>    include/linux/string_choices.h
> 
> between commit:
> 
>    533f2ca2a8a2 ("lib/string_choices: add str_true_false()/str_false_true() helper")
> 
> from the mm-nonmm-unstable branch of the mm tree and commits:
> 
>    a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
>    f5c1ca3a15fd ("string_choices: Add wrapper for str_down_up()")
> 
May be there is the order trouble. In the linux-next, 
str_up_down/str_up_down have been added. And 
str_true_false()/str_false_true() helper are based on the newest linux-next.

Thanks,
Hongbo

> from the kspp 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.
>