Skip to content

Commit 5022317

Browse files
committed
Merge Linux v6.17.7
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2 parents 5c9bb66 + 7660ce6 commit 5022317

File tree

53 files changed

+1325
-1146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1325
-1146
lines changed

Documentation/admin-guide/hw-vuln/attack_vector_controls.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ SRSO X X X X
218218
SSB X
219219
TAA X X X X * (Note 2)
220220
TSA X X X X
221+
VMSCAPE X
221222
=============== ============== ============ ============= ============== ============ ========
222223

223224
Notes:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 17
4-
SUBLEVEL = 6
4+
SUBLEVEL = 7
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/alpha/kernel/asm-offsets.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* This code generates raw asm output which is post-processed to extract
55
* and format the required data.
66
*/
7+
#define COMPILE_OFFSETS
78

89
#include <linux/types.h>
910
#include <linux/stddef.h>

arch/arc/kernel/asm-offsets.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/*
33
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
44
*/
5+
#define COMPILE_OFFSETS
56

67
#include <linux/sched.h>
78
#include <linux/mm.h>

arch/arm/kernel/asm-offsets.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* This code generates raw asm output which is post-processed to extract
88
* and format the required data.
99
*/
10+
#define COMPILE_OFFSETS
11+
1012
#include <linux/compiler.h>
1113
#include <linux/sched.h>
1214
#include <linux/mm.h>

arch/arm64/kernel/asm-offsets.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* 2001-2002 Keith Owens
77
* Copyright (C) 2012 ARM Ltd.
88
*/
9+
#define COMPILE_OFFSETS
910

1011
#include <linux/arm_sdei.h>
1112
#include <linux/sched.h>

arch/csky/kernel/asm-offsets.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
3+
#define COMPILE_OFFSETS
34

45
#include <linux/sched.h>
56
#include <linux/kernel_stat.h>

arch/hexagon/kernel/asm-offsets.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*
99
* Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.
1010
*/
11+
#define COMPILE_OFFSETS
1112

1213
#include <linux/compat.h>
1314
#include <linux/types.h>

arch/loongarch/kernel/asm-offsets.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
*
55
* Copyright (C) 2020-2022 Loongson Technology Corporation Limited
66
*/
7+
#define COMPILE_OFFSETS
8+
79
#include <linux/types.h>
810
#include <linux/sched.h>
911
#include <linux/mm.h>

arch/m68k/kernel/asm-offsets.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* #defines from the assembly-language output.
1010
*/
1111

12+
#define COMPILE_OFFSETS
1213
#define ASM_OFFSETS_C
1314

1415
#include <linux/stddef.h>

0 commit comments

Comments
 (0)