Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the kspp tree with Linus' tree
@ 2020-06-29  5:43 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2020-06-29  5:43 UTC (permalink / raw)
  To: Kees Cook
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sumit Garg,
	Daniel Thompson


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

Hi all,

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

  kernel/debug/kdb/kdb_io.c

between commit:

  9d71b344f86f ("kdb: Re-factor kdb_printf() message write code")

from Linus' tree and commit:

  80b89ab785a4 ("treewide: Remove uninitialized_var() usage")

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 kernel/debug/kdb/kdb_io.c
index 683a799618ad,af0a26a521eb..000000000000
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@@ -591,7 -553,8 +591,7 @@@ int vkdb_printf(enum kdb_msgsrc src, co
  	int this_cpu, old_cpu;
  	char *cp, *cp2, *cphold = NULL, replaced_byte = ' ';
  	char *moreprompt = "more> ";
- 	unsigned long uninitialized_var(flags);
 -	struct console *c;
+ 	unsigned long flags;
  
  	/* Serialize kdb_printf if multiple cpus try to write at once.
  	 * But if any cpu goes recursive in kdb, just print the output,

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the kspp tree with Linus' tree
@ 2020-04-08  2:00 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2020-04-08  2:00 UTC (permalink / raw)
  To: Kees Cook
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Frédéric Pierret (fepitre),
	Masahiro Yamada


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

Hi all,

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

  scripts/gcc-plugins/Makefile

between commits:

  735aab1e008b ("kbuild: add -Wall to KBUILD_HOSTCXXFLAGS")

from Linus' tree and commit:

  dda632f1bc6d ("gcc-common.h: Update for GCC 10")
  8d1951750084 ("gcc-plugins: drop support for GCC <= 4.7")

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/gcc-plugins/Makefile
index f22858b2c3d6,1d0b9382e759..000000000000
--- a/scripts/gcc-plugins/Makefile
+++ b/scripts/gcc-plugins/Makefile
@@@ -1,9 -1,19 +1,10 @@@
  # SPDX-License-Identifier: GPL-2.0
 -PLUGINCC := $(CONFIG_PLUGIN_HOSTCC:"%"=%)
  GCC_PLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
  
 -ifeq ($(PLUGINCC),$(HOSTCC))
 -  HOSTLIBS := hostlibs
 -  HOST_EXTRACFLAGS += -I$(GCC_PLUGINS_DIR)/include -I$(src) -std=gnu99 -ggdb
 -  export HOST_EXTRACFLAGS
 -else
 -  HOSTLIBS := hostcxxlibs
 -  HOST_EXTRACXXFLAGS += -I$(GCC_PLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti
 -  HOST_EXTRACXXFLAGS += -fno-exceptions -fasynchronous-unwind-tables -ggdb
 -  HOST_EXTRACXXFLAGS += -Wno-narrowing -Wno-unused-variable
 -  HOST_EXTRACXXFLAGS += -Wno-format-diag
 -  export HOST_EXTRACXXFLAGS
 -endif
 +HOST_EXTRACXXFLAGS += -I$(GCC_PLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti
 +HOST_EXTRACXXFLAGS += -fno-exceptions -fasynchronous-unwind-tables -ggdb
 +HOST_EXTRACXXFLAGS += -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat
++HOST_EXTRACXXFLAGS += -Wno-format-diag
  
  $(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
  quiet_cmd_create_randomize_layout_seed = GENSEED $@

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the kspp tree with Linus' tree
@ 2020-01-06  4:48 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2020-01-06  4:48 UTC (permalink / raw)
  To: Kees Cook
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sargun Dhillon


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

Hi all,

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

  tools/testing/selftests/seccomp/seccomp_bpf.c

between commit:

  e4ab5ccc357b ("selftests/seccomp: Catch garbage on SECCOMP_IOCTL_NOTIF_RECV")

from Linus' tree and commit:

  589f6c054d7a ("selftests/seccomp: Catch garbage on SECCOMP_IOCTL_NOTIF_RECV")

from the kspp tree.

I fixed it up (I just used the version from Linus' tree as that seems
to have been committed later) 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] 6+ messages in thread

* linux-next: manual merge of the kspp tree with Linus' tree
@ 2017-02-08  1:41 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2017-02-08  1:41 UTC (permalink / raw)
  To: Kees Cook; +Cc: linux-next, linux-kernel, Michal Marek, Emese Revfy

Hi Kees,

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

  include/asm-generic/asm-prototypes.h

between commit:

  c7858bf16c0b ("asm-prototypes: Clear any CPP defines before declaring the functions")

from Linus' tree and commit:

  e89c98504d89 ("initify: Mark functions with the __nocapture attribute")

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/asm-generic/asm-prototypes.h
index 939869c772b1,ea784e02b28e..000000000000
--- a/include/asm-generic/asm-prototypes.h
+++ b/include/asm-generic/asm-prototypes.h
@@@ -1,13 -1,7 +1,13 @@@
  #include <linux/bitops.h>
 +#undef __memset
  extern void *__memset(void *, int, __kernel_size_t);
 +#undef __memcpy
- extern void *__memcpy(void *, const void *, __kernel_size_t);
+ extern void *__memcpy(void *, const void *, __kernel_size_t) __nocapture(2);
 +#undef __memmove
- extern void *__memmove(void *, const void *, __kernel_size_t);
+ extern void *__memmove(void *, const void *, __kernel_size_t) __nocapture(2);
 +#undef memset
  extern void *memset(void *, int, __kernel_size_t);
 +#undef memcpy
- extern void *memcpy(void *, const void *, __kernel_size_t);
+ extern void *memcpy(void *, const void *, __kernel_size_t) __nocapture(2);
 +#undef memmove
- extern void *memmove(void *, const void *, __kernel_size_t);
+ extern void *memmove(void *, const void *, __kernel_size_t) __nocapture(2);

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the kspp tree with Linus' tree
  2016-11-08  2:31 Stephen Rothwell
@ 2016-11-08 18:44 ` Kees Cook
  0 siblings, 0 replies; 6+ messages in thread
From: Kees Cook @ 2016-11-08 18:44 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux-Next, LKML, Emese Revfy

On Mon, Nov 7, 2016 at 7:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> FIXME: Add owner of second tree to To:
>        Add author(s)/SOB of conflicting commits.
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
>   mm/page_alloc.c
>   scripts/gcc-plugins/latent_entropy_plugin.c
>
> between commits:
>
>   38addce8b600 ("gcc-plugins: Add latent_entropy plugin")
>   0766f788eb72 ("latent_entropy: Mark functions with __latent_entropy")
>   58bea4144d23 ("latent_entropy: Fix wrong gcc code generation with 64 bit variables")
>
> from Linus' tree and commits:
>
>   2a5448668a3c ("gcc-plugins: Add latent_entropy plugin")
>   09dd109d8241 ("latent_entropy: Mark functions with __latent_entropy")
>
> from the kspp tree.
>
> I fixed it up (I used the version from Linus' tree) 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.
>
> Kees, maybe you could clean up the kspp tree.

Oh, I wonder how that got out of sync. I've updated the kspp tree.

Thanks!

-Kees

-- 
Kees Cook
Nexus Security

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the kspp tree with Linus' tree
@ 2016-11-08  2:31 Stephen Rothwell
  2016-11-08 18:44 ` Kees Cook
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2016-11-08  2:31 UTC (permalink / raw)
  To: Kees Cook; +Cc: linux-next, linux-kernel, Emese Revfy

Hi Kees,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  mm/page_alloc.c
  scripts/gcc-plugins/latent_entropy_plugin.c

between commits:

  38addce8b600 ("gcc-plugins: Add latent_entropy plugin")
  0766f788eb72 ("latent_entropy: Mark functions with __latent_entropy")
  58bea4144d23 ("latent_entropy: Fix wrong gcc code generation with 64 bit variables")

from Linus' tree and commits:

  2a5448668a3c ("gcc-plugins: Add latent_entropy plugin")
  09dd109d8241 ("latent_entropy: Mark functions with __latent_entropy")

from the kspp tree.

I fixed it up (I used the version from Linus' tree) 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.

Kees, maybe you could clean up the kspp tree.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-29  5:43 linux-next: manual merge of the kspp tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-04-08  2:00 Stephen Rothwell
2020-01-06  4:48 Stephen Rothwell
2017-02-08  1:41 Stephen Rothwell
2016-11-08  2:31 Stephen Rothwell
2016-11-08 18:44 ` Kees Cook

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git