From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 6 Jan 2020 06:51:15 +0000 (+0100)
Subject: Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict
X-Git-Tag: v5.8-rc1~33^2~11^2~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=31c7ac388aa905a196ee16dff2015111f701f035;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

31c7ac388aa905a196ee16dff2015111f701f035
diff --cc init/main.c
index 919f65faeb7e,2cd736059416..e8fdfb7425a3
--- a/init/main.c
+++ b/init/main.c
@@@ -93,8 -93,6 +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>