* linux-next: manual merge of the kspp tree with the kbuild tree
@ 2018-08-03 7:30 Stephen Rothwell
2018-08-15 23:56 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2018-08-03 7:30 UTC (permalink / raw)
To: Kees Cook, Masahiro Yamada
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
arch/Kconfig
between commit:
22471e1313f2 ("kconfig: use a menu in arch/Kconfig to reduce clutter")
from the kbuild tree and commit:
45332b1bdfdc ("gcc-plugins: split out Kconfig entries to scripts/gcc-plugins/Kconfig")
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 arch/Kconfig
index 6cf1b17a8df2,43f315b84c8f..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -984,4 -836,4 +847,6 @@@ config REFCOUNT_FUL
source "kernel/gcov/Kconfig"
+ source "scripts/gcc-plugins/Kconfig"
++
+endmenu
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the kspp tree with the kbuild tree
2018-08-03 7:30 linux-next: manual merge of the kspp tree with the kbuild tree Stephen Rothwell
@ 2018-08-15 23:56 ` Stephen Rothwell
2018-08-15 23:58 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2018-08-15 23:56 UTC (permalink / raw)
To: Kees Cook
Cc: Masahiro Yamada, Linux-Next Mailing List,
Linux Kernel Mailing List, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
Hi all,
On Fri, 3 Aug 2018 17:30:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> arch/Kconfig
>
> between commit:
>
> 22471e1313f2 ("kconfig: use a menu in arch/Kconfig to reduce clutter")
>
> from the kbuild tree and commit:
>
> 45332b1bdfdc ("gcc-plugins: split out Kconfig entries to scripts/gcc-plugins/Kconfig")
>
> 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 arch/Kconfig
> index 6cf1b17a8df2,43f315b84c8f..000000000000
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@@ -984,4 -836,4 +847,6 @@@ config REFCOUNT_FUL
>
> source "kernel/gcov/Kconfig"
>
> + source "scripts/gcc-plugins/Kconfig"
> ++
> +endmenu
This is now a conflict between Linus' tree and the kspp tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the kspp tree with the kbuild tree
2018-08-15 23:56 ` Stephen Rothwell
@ 2018-08-15 23:58 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2018-08-15 23:58 UTC (permalink / raw)
To: Kees Cook
Cc: Masahiro Yamada, Linux-Next Mailing List,
Linux Kernel Mailing List, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]
Hi all,
On Thu, 16 Aug 2018 09:56:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 3 Aug 2018 17:30:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the kspp tree got a conflict in:
> >
> > arch/Kconfig
> >
> > between commit:
> >
> > 22471e1313f2 ("kconfig: use a menu in arch/Kconfig to reduce clutter")
> >
> > from the kbuild tree and commit:
> >
> > 45332b1bdfdc ("gcc-plugins: split out Kconfig entries to scripts/gcc-plugins/Kconfig")
> >
> > 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 arch/Kconfig
> > index 6cf1b17a8df2,43f315b84c8f..000000000000
> > --- a/arch/Kconfig
> > +++ b/arch/Kconfig
> > @@@ -984,4 -836,4 +847,6 @@@ config REFCOUNT_FUL
> >
> > source "kernel/gcov/Kconfig"
> >
> > + source "scripts/gcc-plugins/Kconfig"
> > ++
> > +endmenu
>
> This is now a conflict between Linus' tree and the kspp tree.
Ignore this, the kspp tree has been merged by Linus as well.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the kspp tree with the kbuild tree
2024-02-26 5:58 Stephen Rothwell
2024-02-27 2:24 ` Kees Cook
@ 2024-03-13 22:44 ` Stephen Rothwell
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2024-03-13 22:44 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Kees Cook, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]
Hi all,
On Mon, 26 Feb 2024 16:58:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> scripts/Makefile.lib
>
> between commit:
>
> bf48d9b756b9 ("kbuild: change tool coverage variables to take the path relative to $(obj)")
>
> from the kbuild tree and commits:
>
> 918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL")
> 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
>
> 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.
>
> diff --cc scripts/Makefile.lib
> index 298bd8c80d65,b4a248c20654..000000000000
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@@ -181,8 -175,11 +181,11 @@@ endi
>
> ifeq ($(CONFIG_UBSAN),y)
> _c_flags += $(if $(patsubst n%,, \
> - $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \
> - $(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
> ++ $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \
> $(CFLAGS_UBSAN))
> + _c_flags += $(if $(patsubst n%,, \
> - $(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
> ++ $(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
> + $(CFLAGS_UBSAN_SIGNED_WRAP))
> endif
>
> ifeq ($(CONFIG_KCOV),y)
This is now a conflict between the kbuild tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the kspp tree with the kbuild tree
2024-02-26 5:58 Stephen Rothwell
@ 2024-02-27 2:24 ` Kees Cook
2024-03-13 22:44 ` Stephen Rothwell
1 sibling, 0 replies; 7+ messages in thread
From: Kees Cook @ 2024-02-27 2:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Masahiro Yamada, Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Feb 26, 2024 at 04:58:11PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> scripts/Makefile.lib
>
> between commit:
>
> bf48d9b756b9 ("kbuild: change tool coverage variables to take the path relative to $(obj)")
>
> from the kbuild tree and commits:
>
> 918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL")
> 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
>
> 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.
Thanks for this! Yes, this conflict resolution looks correct to me.
-Kees
> diff --cc scripts/Makefile.lib
> index 298bd8c80d65,b4a248c20654..000000000000
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@@ -181,8 -175,11 +181,11 @@@ endi
>
> ifeq ($(CONFIG_UBSAN),y)
> _c_flags += $(if $(patsubst n%,, \
> - $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \
> - $(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
> ++ $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \
> $(CFLAGS_UBSAN))
> + _c_flags += $(if $(patsubst n%,, \
> - $(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
> ++ $(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
> + $(CFLAGS_UBSAN_SIGNED_WRAP))
> endif
>
> ifeq ($(CONFIG_KCOV),y)
--
Kees Cook
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the kspp tree with the kbuild tree
@ 2024-02-26 5:58 Stephen Rothwell
2024-02-27 2:24 ` Kees Cook
2024-03-13 22:44 ` Stephen Rothwell
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2024-02-26 5:58 UTC (permalink / raw)
To: Kees Cook, Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
scripts/Makefile.lib
between commit:
bf48d9b756b9 ("kbuild: change tool coverage variables to take the path relative to $(obj)")
from the kbuild tree and commits:
918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL")
557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
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 scripts/Makefile.lib
index 298bd8c80d65,b4a248c20654..000000000000
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@@ -181,8 -175,11 +181,11 @@@ endi
ifeq ($(CONFIG_UBSAN),y)
_c_flags += $(if $(patsubst n%,, \
- $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \
- $(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
++ $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \
$(CFLAGS_UBSAN))
+ _c_flags += $(if $(patsubst n%,, \
- $(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
++ $(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
+ $(CFLAGS_UBSAN_SIGNED_WRAP))
endif
ifeq ($(CONFIG_KCOV),y)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the kspp tree with the kbuild tree
@ 2021-08-26 6:48 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2021-08-26 6:48 UTC (permalink / raw)
To: Kees Cook, Masahiro Yamada
Cc: Gustavo A. R. Silva, Linux Kernel Mailing List,
Linux Next Mailing List, Nick Desaulniers
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
Makefile
between commit:
389640bf8d17 ("Makefile: remove stale cc-option checks")
from the kbuild tree and commits:
2d931b634b81 ("Makefile: Enable -Warray-bounds")
7d8aac16a0a8 ("Makefile: Enable -Wzero-length-bounds")
from the kspp tree.
I fixed it up (the latter removed the line modified by the former,
so I just used the latter) 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-03-13 22:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-03 7:30 linux-next: manual merge of the kspp tree with the kbuild tree Stephen Rothwell
2018-08-15 23:56 ` Stephen Rothwell
2018-08-15 23:58 ` Stephen Rothwell
2021-08-26 6:48 Stephen Rothwell
2024-02-26 5:58 Stephen Rothwell
2024-02-27 2:24 ` Kees Cook
2024-03-13 22:44 ` Stephen Rothwell
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).