linux-next: manual merge of the kspp tree with Linus' tree

2020-10-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kspp tree got a conflict in: lib/random32.c between commit: 09a6b0bc3be7 ("random32: Restore __latent_entropy attribute on net_rand_state") from Linus' tree and commit: 2ce6b0d4293b ("random32: Restore __latent_entropy attribute on net_rand_stat

linux-next: manual merge of the kspp tree with Linus' tree

2020-06-29 Thread Stephen Rothwell
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

linux-next: manual merge of the kspp tree with Linus' tree

2017-02-07 Thread Stephen Rothwell
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

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

2016-11-08 Thread Kees Cook
On Mon, Nov 7, 2016 at 7:31 PM, Stephen Rothwell 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 >

linux-next: manual merge of the kspp tree with Linus' tree

2016-11-07 Thread Stephen Rothwell
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