lkml.org 
[lkml]   [2020]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with Linus' tree

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> init/main.c
>
> between commit:
>
> 74f1a299107b ("Revert "fs: remove ksys_dup()"")
>
> from Linus' tree and commit:
>
> dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")
>
> from the tip 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 init/main.c
> index 2cd736059416,919f65faeb7e..000000000000
> --- a/init/main.c
> +++ b/init/main.c
> @@@ -93,6 -93,8 +93,7 @@@
> #include <linux/rodata_test.h>
> #include <linux/jump_label.h>
> #include <linux/mem_encrypt.h>
> -#include <linux/file.h>
> + #include <linux/kcsan.h>

I've resolved this conflict in -tip as well, so this should go away on
the next integration of -next.

Thanks,

Ingo

\
 
 \ /
  Last update: 2020-01-06 07:54    [W:0.052 / U:0.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site