Skip to content

Commit d6b9ce7

Browse files
gregkhgregkh
committed
Merge tag 'stratix10_svc_fix_v6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into char-misc-linus
Dinh writes: firmware: stratix10-svc: fix saving contoller data for v6.18 - Fix the incorrect use of platform_set_drvdata and dev_set_drvdata * tag 'stratix10_svc_fix_v6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: (237 commits) firmware: stratix10-svc: fix bug in saving controller data Linux 6.18-rc4 objtool: Fix skip_alt_group() for non-alternative STAC/CLAC kconfig/nconf: Initialize the default locale at startup kconfig/mconf: Initialize the default locale at startup x86/mm: Ensure clear_page() variants always have __kcfi_typeid_ symbols PCI: Do not size non-existing prefetchable window Revert "PCI: qcom: Remove custom ASPM enablement code" bpf/arm64: Fix BPF_ST into arena memory bpf: Make migrate_disable always inline to avoid partial inlining null_blk: set dma alignment to logical block size xfs: document another racy GC case in xfs_zoned_map_extent xfs: prevent gc from picking the same zone twice drm/ast: Clear preserved bits from register output value s390: Disable ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP drm/imx: parallel-display: add the bridge before attaching it drm/imx: parallel-display: convert to devm_drm_bridge_alloc() API blk-crypto: use BLK_STS_INVAL for alignment errors regulator: bd718x7: Fix voltages scaled by resistor divider x86/cpu: Add/fix core comments for {Panther,Nova} Lake ...
2 parents 8d422b8 + d0fcf70 commit d6b9ce7

253 files changed

Lines changed: 2023 additions & 854 deletions

File tree

Some content is hidden

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

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
644644
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
645645
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
646646
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
647+
Rae Moar <raemoar63@gmail.com> <rmoar@google.com>
647648
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
648649
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
649650
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a
20362036
S: 602 00 Brno
20372037
S: Czech Republic
20382038

2039+
N: Karsten Keil
2040+
E: isdn@linux-pingi.de
2041+
D: ISDN subsystem maintainer
2042+
20392043
N: Jakob Kemi
20402044
E: jakob.kemi@telia.com
20412045
D: V4L W9966 Webcam driver

‎Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ allOf:
180180
then:
181181
properties:
182182
reg:
183-
minItems: 2
183+
maxItems: 2
184184
reg-names:
185-
minItems: 2
185+
maxItems: 2
186186
else:
187187
properties:
188188
reg:

‎Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ properties:
3232
3333
$ref: /schemas/types.yaml#/definitions/uint32-array
3434
minItems: 2
35-
maxItems: 2
35+
maxItems: 4
3636
items:
3737
enum: [1, 2, 3, 4]
3838

@@ -48,7 +48,7 @@ properties:
4848
4949
$ref: /schemas/types.yaml#/definitions/uint32-array
5050
minItems: 2
51-
maxItems: 2
51+
maxItems: 5
5252
items:
5353
enum: [1, 2, 3, 4, 5]
5454

‎Documentation/netlink/specs/dpll.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ operations:
605605
reply: &pin-attrs
606606
attributes:
607607
- id
608+
- module-name
609+
- clock-id
608610
- board-label
609611
- panel-label
610612
- package-label

‎Documentation/networking/netconsole.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ Userdata append support by Matthew Wood <thepacketgeek@gmail.com>, Jan 22 2024
1919

2020
Sysdata append support by Breno Leitao <leitao@debian.org>, Jan 15 2025
2121

22-
Please send bug reports to Matt Mackall <mpm@selenic.com>
23-
Satyam Sharma <satyam.sharma@gmail.com>, and Cong Wang <xiyou.wangcong@gmail.com>
24-
2522
Introduction:
2623
=============
2724

‎MAINTAINERS‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13260,10 +13260,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git mast
1326013260
F: drivers/infiniband/ulp/isert
1326113261

1326213262
ISDN/CMTP OVER BLUETOOTH
13263-
M: Karsten Keil <isdn@linux-pingi.de>
13264-
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
1326513263
L: netdev@vger.kernel.org
13266-
S: Odd Fixes
13264+
S: Orphan
1326713265
W: http://www.isdn4linux.de
1326813266
F: Documentation/isdn/
1326913267
F: drivers/isdn/capi/
@@ -13272,10 +13270,8 @@ F: include/uapi/linux/isdn/
1327213270
F: net/bluetooth/cmtp/
1327313271

1327413272
ISDN/mISDN SUBSYSTEM
13275-
M: Karsten Keil <isdn@linux-pingi.de>
13276-
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
1327713273
L: netdev@vger.kernel.org
13278-
S: Maintained
13274+
S: Orphan
1327913275
W: http://www.isdn4linux.de
1328013276
F: drivers/isdn/Kconfig
1328113277
F: drivers/isdn/Makefile
@@ -13429,9 +13425,12 @@ F: mm/kasan/
1342913425
F: scripts/Makefile.kasan
1343013426

1343113427
KCONFIG
13428+
M: Nathan Chancellor <nathan@kernel.org>
13429+
M: Nicolas Schier <nsc@kernel.org>
1343213430
L: linux-kbuild@vger.kernel.org
13433-
S: Orphan
13431+
S: Odd Fixes
1343413432
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
13433+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git
1343513434
F: Documentation/kbuild/kconfig*
1343613435
F: scripts/Kconfig.include
1343713436
F: scripts/kconfig/
@@ -13616,7 +13615,7 @@ F: fs/smb/server/
1361613615
KERNEL UNIT TESTING FRAMEWORK (KUnit)
1361713616
M: Brendan Higgins <brendan.higgins@linux.dev>
1361813617
M: David Gow <davidgow@google.com>
13619-
R: Rae Moar <rmoar@google.com>
13618+
R: Rae Moar <raemoar63@gmail.com>
1362013619
L: linux-kselftest@vger.kernel.org
1362113620
L: kunit-dev@googlegroups.com
1362213621
S: Maintained
@@ -21332,6 +21331,7 @@ F: drivers/media/platform/qcom/venus/
2133221331
QUALCOMM WCN36XX WIRELESS DRIVER
2133321332
M: Loic Poulain <loic.poulain@oss.qualcomm.com>
2133421333
L: wcn36xx@lists.infradead.org
21334+
L: linux-wireless@vger.kernel.org
2133521335
S: Supported
2133621336
W: https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
2133721337
F: drivers/net/wireless/ath/wcn36xx/

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 18
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc4
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

‎arch/arm64/net/bpf_jit_comp.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
12131213
u8 src = bpf2a64[insn->src_reg];
12141214
const u8 tmp = bpf2a64[TMP_REG_1];
12151215
const u8 tmp2 = bpf2a64[TMP_REG_2];
1216+
const u8 tmp3 = bpf2a64[TMP_REG_3];
12161217
const u8 fp = bpf2a64[BPF_REG_FP];
12171218
const u8 arena_vm_base = bpf2a64[ARENA_VM_START];
12181219
const u8 priv_sp = bpf2a64[PRIVATE_SP];
@@ -1757,8 +1758,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
17571758
case BPF_ST | BPF_PROBE_MEM32 | BPF_W:
17581759
case BPF_ST | BPF_PROBE_MEM32 | BPF_DW:
17591760
if (BPF_MODE(insn->code) == BPF_PROBE_MEM32) {
1760-
emit(A64_ADD(1, tmp2, dst, arena_vm_base), ctx);
1761-
dst = tmp2;
1761+
emit(A64_ADD(1, tmp3, dst, arena_vm_base), ctx);
1762+
dst = tmp3;
17621763
}
17631764
if (dst == fp) {
17641765
dst_adj = ctx->priv_sp_used ? priv_sp : A64_SP;

‎arch/s390/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ config S390
158158
select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
159159
select ARCH_WANT_KERNEL_PMD_MKWRITE
160160
select ARCH_WANT_LD_ORPHAN_WARN
161-
select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
162161
select ARCH_WANTS_THP_SWAP
163162
select BUILDTIME_TABLE_SORT
164163
select CLONE_BACKWARDS2

0 commit comments

Comments
 (0)