Skip to content

Commit f3847af

Browse files
htejunhtejun
committed
Merge branch 'for-6.7' into for-next
2 parents dd64c87 + 6465e26 commit f3847af

File tree

410 files changed

+3849
-2265
lines changed

Some content is hidden

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

410 files changed

+3849
-2265
lines changed

‎Documentation/arch/arm64/cpu-feature-registers.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ infrastructure:
175175
+------------------------------+---------+---------+
176176
| Name | bits | visible |
177177
+------------------------------+---------+---------+
178+
| SME | [27-24] | y |
179+
+------------------------------+---------+---------+
178180
| MTE | [11-8] | y |
179181
+------------------------------+---------+---------+
180182
| SSBS | [7-4] | y |
@@ -288,8 +290,18 @@ infrastructure:
288290
+------------------------------+---------+---------+
289291
| Name | bits | visible |
290292
+------------------------------+---------+---------+
293+
| CSSC | [55-52] | y |
294+
+------------------------------+---------+---------+
295+
| RPRFM | [51-48] | y |
296+
+------------------------------+---------+---------+
297+
| BC | [23-20] | y |
298+
+------------------------------+---------+---------+
291299
| MOPS | [19-16] | y |
292300
+------------------------------+---------+---------+
301+
| APA3 | [15-12] | y |
302+
+------------------------------+---------+---------+
303+
| GPA3 | [11-8] | y |
304+
+------------------------------+---------+---------+
293305
| RPRES | [7-4] | y |
294306
+------------------------------+---------+---------+
295307
| WFXT | [3-0] | y |

‎Documentation/arch/arm64/elf_hwcaps.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ HWCAP2_SMEF16F16
305305
HWCAP2_MOPS
306306
Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.
307307

308+
HWCAP2_HBC
309+
Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.
310+
308311
4. Unused AT_HWCAP bits
309312
-----------------------
310313

‎Documentation/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ Documentation of LoongArch ISA:
381381

382382
Documentation of LoongArch ELF psABI:
383383

384-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf (in Chinese)
384+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf (in Chinese)
385385

386-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf (in English)
386+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf (in English)
387387

388388
Linux kernel repository of Loongson and LoongArch:
389389

‎Documentation/networking/ax25.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ AX.25
77
To use the amateur radio protocols within Linux you will need to get a
88
suitable copy of the AX.25 Utilities. More detailed information about
99
AX.25, NET/ROM and ROSE, associated programs and utilities can be
10-
found on http://www.linux-ax25.org.
10+
found on https://linux-ax25.in-berlin.de.
1111

12-
There is an active mailing list for discussing Linux amateur radio matters
12+
There is a mailing list for discussing Linux amateur radio matters
1313
called linux-hams@vger.kernel.org. To subscribe to it, send a message to
1414
majordomo@vger.kernel.org with the words "subscribe linux-hams" in the body
1515
of the message, the subject field is ignored. You don't need to be

‎Documentation/sound/designs/midi-2.0.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ topology based on those information. When the device is older and
7474
doesn't respond to the new UMP inquiries, the driver falls back and
7575
builds the topology based on Group Terminal Block (GTB) information
7676
from the USB descriptor. Some device might be screwed up by the
77-
unexpected UMP command; in such a case, pass `midi2_probe=0` option to
78-
snd-usb-audio driver for skipping the UMP v1.1 inquiries.
77+
unexpected UMP command; in such a case, pass `midi2_ump_probe=0`
78+
option to snd-usb-audio driver for skipping the UMP v1.1 inquiries.
7979

8080
When the MIDI 2.0 device is probed, the kernel creates a rawmidi
8181
device for each UMP Endpoint of the device. Its device name is

‎Documentation/translations/zh_CN/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,9 @@ LoongArch指令集架构的文档：
344344

345345
LoongArch的ELF psABI文档：
346346

347-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf （中文版）
347+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf （中文版）
348348

349-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf （英文版）
349+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf （英文版）
350350

351351
Loongson与LoongArch的Linux内核源码仓库：
352352

‎MAINTAINERS

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@ F: arch/arm*/include/asm/perf_event.h
16621662
F: arch/arm*/kernel/hw_breakpoint.c
16631663
F: arch/arm*/kernel/perf_*
16641664
F: drivers/perf/
1665-
F: include/linux/perf/arm_pmu.h
1665+
F: include/linux/perf/arm_pmu*.h
16661666

16671667
ARM PORT
16681668
M: Russell King <linux@armlinux.org.uk>
@@ -3344,7 +3344,7 @@ AX.25 NETWORK LAYER
33443344
M: Ralf Baechle <ralf@linux-mips.org>
33453345
L: linux-hams@vger.kernel.org
33463346
S: Maintained
3347-
W: http://www.linux-ax25.org/
3347+
W: https://linux-ax25.in-berlin.de
33483348
F: include/net/ax25.h
33493349
F: include/uapi/linux/ax25.h
33503350
F: net/ax25/
@@ -6645,7 +6645,6 @@ F: Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
66456645
F: drivers/gpu/drm/panel/panel-novatek-nt36672a.c
66466646

66476647
DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
6648-
M: Ben Skeggs <bskeggs@redhat.com>
66496648
M: Karol Herbst <kherbst@redhat.com>
66506649
M: Lyude Paul <lyude@redhat.com>
66516650
L: dri-devel@lists.freedesktop.org
@@ -8874,7 +8873,7 @@ F: drivers/gpio/gpio-mockup.c
88748873
F: tools/testing/selftests/gpio/
88758874

88768875
GPIO REGMAP
8877-
R: Michael Walle <michael@walle.cc>
8876+
M: Michael Walle <michael@walle.cc>
88788877
S: Maintained
88798878
F: drivers/gpio/gpio-regmap.c
88808879
F: include/linux/gpio/regmap.h
@@ -13616,6 +13615,7 @@ F: drivers/net/ethernet/mellanox/mlxfw/
1361613615

1361713616
MELLANOX HARDWARE PLATFORM SUPPORT
1361813617
M: Hans de Goede <hdegoede@redhat.com>
13618+
M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1361913619
M: Mark Gross <markgross@kernel.org>
1362013620
M: Vadim Pasternak <vadimp@nvidia.com>
1362113621
L: platform-driver-x86@vger.kernel.org
@@ -14210,6 +14210,7 @@ F: drivers/platform/surface/surface_gpe.c
1421014210

1421114211
MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
1421214212
M: Hans de Goede <hdegoede@redhat.com>
14213+
M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1421314214
M: Mark Gross <markgross@kernel.org>
1421414215
M: Maximilian Luz <luzmaximilian@gmail.com>
1421514216
L: platform-driver-x86@vger.kernel.org
@@ -14756,7 +14757,7 @@ NETROM NETWORK LAYER
1475614757
M: Ralf Baechle <ralf@linux-mips.org>
1475714758
L: linux-hams@vger.kernel.org
1475814759
S: Maintained
14759-
W: http://www.linux-ax25.org/
14760+
W: https://linux-ax25.in-berlin.de
1476014761
F: include/net/netrom.h
1476114762
F: include/uapi/linux/netrom.h
1476214763
F: net/netrom/
@@ -18607,7 +18608,7 @@ ROSE NETWORK LAYER
1860718608
M: Ralf Baechle <ralf@linux-mips.org>
1860818609
L: linux-hams@vger.kernel.org
1860918610
S: Maintained
18610-
W: http://www.linux-ax25.org/
18611+
W: https://linux-ax25.in-berlin.de
1861118612
F: include/net/rose.h
1861218613
F: include/uapi/linux/rose.h
1861318614
F: net/rose/
@@ -23423,9 +23424,11 @@ F: drivers/platform/x86/x86-android-tablets/
2342323424

2342423425
X86 PLATFORM DRIVERS
2342523426
M: Hans de Goede <hdegoede@redhat.com>
23427+
M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
2342623428
M: Mark Gross <markgross@kernel.org>
2342723429
L: platform-driver-x86@vger.kernel.org
2342823430
S: Maintained
23431+
Q: https://patchwork.kernel.org/project/platform-driver-x86/list/
2342923432
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
2343023433
F: drivers/platform/olpc/
2343123434
F: drivers/platform/x86/

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 6
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/arm/xen/enlighten.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static void xen_power_off(void)
207207

208208
static irqreturn_t xen_arm_callback(int irq, void *arg)
209209
{
210-
xen_hvm_evtchn_do_upcall();
210+
xen_evtchn_do_upcall();
211211
return IRQ_HANDLED;
212212
}
213213

‎arch/arm64/include/asm/cpufeature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ static inline bool supports_clearbhb(int scope)
663663
isar2 = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1);
664664

665665
return cpuid_feature_extract_unsigned_field(isar2,
666-
ID_AA64ISAR2_EL1_BC_SHIFT);
666+
ID_AA64ISAR2_EL1_CLRBHB_SHIFT);
667667
}
668668

669669
const struct cpumask *system_32bit_el0_cpumask(void);

0 commit comments

Comments
 (0)