Merge tag 'v5.5-rc3' into sched/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-12-25 10:41:37 +01:00
parent a5e37de90e 46cf053efe
commit 1e5f8a3085
2365 changed files with 73848 additions and 24153 deletions
--- a/arch/mips/include/uapi/asm/msgbuf.h
+++ b/arch/mips/include/uapi/asm/msgbuf.h
@@ -2,6 +2,7 @@
 #ifndef _ASM_MSGBUF_H
 #define _ASM_MSGBUF_H

+#include <asm/ipcbuf.h>

 /*
 * The msqid64_ds structure for the MIPS architecture.
--- a/arch/mips/include/uapi/asm/sembuf.h
+++ b/arch/mips/include/uapi/asm/sembuf.h
@@ -2,6 +2,8 @@
 #ifndef _ASM_SEMBUF_H
 #define _ASM_SEMBUF_H

+#include <asm/ipcbuf.h>
+
 /*
 * The semid64_ds structure for the MIPS architecture.
 * Note extra padding because this structure is passed back and forth