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

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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc init/main.c
index 919f65faeb7e96471af69e8990c9ef84177f8cb9,2cd736059416f90e5347a3f965d1b6c3e25434fa..e8fdfb7425a37777feeff691303da52f7b26e7e9
--- 1/init/main.c
--- 2/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>