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

From: Stephen Rothwell
Date: Sun Jan 05 2020 - 21:18:02 EST

Hi all,

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


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.

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>

#include <asm/io.h>
#include <asm/bugs.h>

Attachment: pgpns5jh5RYKM.pgp
Description: OpenPGP digital signature