The following commit has been merged into the timers/core branch of tip: Commit-ID: 3ebacc96f8862eb26f8a6568d91bda8ecff19879 Gitweb: https://git.kernel.org/tip/3ebacc96f8862eb26f8a6568d91bda8ecff19879 Author: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx> AuthorDate: Mon, 19 Feb 2024 16:39:31 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 20 Feb 2024 20:56:00 +01:00 s390/vdso/data: Drop unnecessary header include vdso/datapage.h includes the architecture specific vdso/data.h header file. So there is no need to do it also the other way round and including the generic vdso/datapage.h header file inside the architecture specific data.h header file. Signed-off-by: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> Acked-by: Heiko Carstens <hca@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20240219153939.75719-3-anna-maria@xxxxxxxxxxxxx --- arch/s390/include/asm/vdso/data.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/s390/include/asm/vdso/data.h b/arch/s390/include/asm/vdso/data.h index 73ee891..0e2b40e 100644 --- a/arch/s390/include/asm/vdso/data.h +++ b/arch/s390/include/asm/vdso/data.h @@ -3,7 +3,6 @@ #define __S390_ASM_VDSO_DATA_H #include <linux/types.h> -#include <vdso/datapage.h> struct arch_vdso_data { __s64 tod_steering_delta;