Skip to content

Commit 956c5a5

Browse files
maddy-kerneldevmaddy-kerneldev
committed
Automatic merge of 'master' into merge (2025-02-17 20:37)
2 parents 3062e4b + 0ad2507 commit 956c5a5

File tree

353 files changed

+3764
-2004
lines changed

Some content is hidden

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

353 files changed

+3764
-2004
lines changed

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ Juha Yrjola <[email protected]>
376376
Julien Thierry <[email protected]> <[email protected]>
377377
Iskren Chernev <[email protected]> <[email protected]>
378378
Kalle Valo <[email protected]> <[email protected]>
379+
Kalle Valo <[email protected]> <[email protected]>
379380
Kalyan Thota <[email protected]> <[email protected]>
380381
Karthikeyan Periyasamy <[email protected]> <[email protected]>
381382
Kathiravan T <[email protected]> <[email protected]>

‎Documentation/arch/arm64/gcs.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ intended to be exhaustive.
3737
shadow stacks rather than GCS.
3838

3939
* Support for GCS is reported to userspace via HWCAP_GCS in the aux vector
40-
AT_HWCAP2 entry.
40+
AT_HWCAP entry.
4141

4242
* GCS is enabled per thread. While there is support for disabling GCS
4343
at runtime this should be done with great care.

‎Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

‎Documentation/devicetree/bindings/clock/qcom,sa8775p-camcc.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

‎Documentation/devicetree/bindings/clock/qcom,sa8775p-videocc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:

‎Documentation/devicetree/bindings/display/panel/powertip,hx8238a.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,hx8238a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,hx8238a
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...

‎Documentation/devicetree/bindings/display/panel/powertip,st7272.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,st7272.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,st7272
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...

‎Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
compatible:
2424
enum:
2525
- ti,am625-dss
26-
- ti,am62a7,dss
26+
- ti,am62a7-dss
2727
- ti,am65x-dss
2828

2929
reg:

‎Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies ath10k wireless devices
88

99
maintainers:
10-
- Kalle Valo <[email protected]>
1110
- Jeff Johnson <[email protected]>
1211

1312
description:

‎Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices (PCIe)
99

1010
maintainers:
11-
- Kalle Valo <[email protected]>
1211
- Jeff Johnson <[email protected]>
1312

1413
description: |

‎Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices
99

1010
maintainers:
11-
- Kalle Valo <[email protected]>
1211
- Jeff Johnson <[email protected]>
1312

1413
description: |

‎Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe) with WSI interface
99

1010
maintainers:
1111
- Jeff Johnson <[email protected]>
12-
- Kalle Valo <[email protected]>
1312

1413
description: |
1514
Qualcomm Technologies IEEE 802.11be PCIe devices with WSI interface.

‎Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe)
99

1010
maintainers:
1111
- Jeff Johnson <[email protected]>
12-
- Kalle Valo <[email protected]>
1312

1413
description:
1514
Qualcomm Technologies IEEE 802.11be PCIe devices.

‎Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ properties:
3636
- qcom,qcs404-qfprom
3737
- qcom,qcs615-qfprom
3838
- qcom,qcs8300-qfprom
39+
- qcom,sar2130p-qfprom
3940
- qcom,sc7180-qfprom
4041
- qcom,sc7280-qfprom
4142
- qcom,sc8280xp-qfprom

‎Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ description:
2222
Each sub-node is identified using the node's name, with valid values listed
2323
for each of the pmics below.
2424

25-
For mp5496, s1, s2
25+
For mp5496, s1, s2, l2, l5
2626

2727
For pm2250, s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,
2828
l12, l13, l14, l15, l16, l17, l18, l19, l20, l21, l22

‎Documentation/driver-api/infrastructure.rst

+6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ Device Drivers Base
4141
.. kernel-doc:: drivers/base/class.c
4242
:export:
4343

44+
.. kernel-doc:: include/linux/device/faux.h
45+
:internal:
46+
47+
.. kernel-doc:: drivers/base/faux.c
48+
:export:
49+
4450
.. kernel-doc:: drivers/base/node.c
4551
:internal:
4652

‎Documentation/netlink/specs/ethtool.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,8 @@ attribute-sets:
15241524
nested-attributes: bitset
15251525
-
15261526
name: hwtstamp-flags
1527-
type: u32
1527+
type: nest
1528+
nested-attributes: bitset
15281529

15291530
operations:
15301531
enum-model: directional

‎Documentation/networking/iso15765-2.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ to their default.
369369
370370
addr.can_family = AF_CAN;
371371
addr.can_ifindex = if_nametoindex("can0");
372-
addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373-
addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
372+
addr.can_addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373+
addr.can_addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
374374
375375
ret = bind(s, (struct sockaddr *)&addr, sizeof(addr));
376376
if (ret < 0)

‎MAINTAINERS

+15-13
Original file line numberDiff line numberDiff line change
@@ -3654,7 +3654,6 @@ F: Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
36543654
F: drivers/phy/qualcomm/phy-ath79-usb.c
36553655

36563656
ATHEROS ATH GENERIC UTILITIES
3657-
M: Kalle Valo <[email protected]>
36583657
M: Jeff Johnson <[email protected]>
36593658
L: [email protected]
36603659
S: Supported
@@ -3859,13 +3858,6 @@ W: https://ez.analog.com/linux-software-drivers
38593858
F: Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml
38603859
F: drivers/pwm/pwm-axi-pwmgen.c
38613860

3862-
AXXIA I2C CONTROLLER
3863-
M: Krzysztof Adamski <[email protected]>
3864-
L: [email protected]
3865-
S: Maintained
3866-
F: Documentation/devicetree/bindings/i2c/i2c-axxia.txt
3867-
F: drivers/i2c/busses/i2c-axxia.c
3868-
38693861
AZ6007 DVB DRIVER
38703862
M: Mauro Carvalho Chehab <[email protected]>
38713863
L: [email protected]
@@ -7116,8 +7108,10 @@ F: rust/kernel/device.rs
71167108
F: rust/kernel/device_id.rs
71177109
F: rust/kernel/devres.rs
71187110
F: rust/kernel/driver.rs
7111+
F: rust/kernel/faux.rs
71197112
F: rust/kernel/platform.rs
71207113
F: samples/rust/rust_driver_platform.rs
7114+
F: samples/rust/rust_driver_faux.rs
71217115

71227116
DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS)
71237117
M: Nishanth Menon <[email protected]>
@@ -10822,7 +10816,7 @@ S: Odd Fixes
1082210816
F: drivers/tty/hvc/
1082310817

1082410818
I2C ACPI SUPPORT
10825-
M: Mika Westerberg <[email protected]>
10819+
M: Mika Westerberg <[email protected]>
1082610820
L: [email protected]
1082710821
L: [email protected]
1082810822
S: Maintained
@@ -16438,7 +16432,7 @@ X: drivers/net/can/
1643816432
X: drivers/net/wireless/
1643916433

1644016434
NETWORKING DRIVERS (WIRELESS)
16441-
M: Kalle Valo <[email protected]>
16435+
M: Johannes Berg <[email protected]>
1644216436
L: [email protected]
1644316437
S: Maintained
1644416438
W: https://wireless.wiki.kernel.org/
@@ -16509,6 +16503,7 @@ F: include/linux/netdev*
1650916503
F: include/linux/netlink.h
1651016504
F: include/linux/netpoll.h
1651116505
F: include/linux/rtnetlink.h
16506+
F: include/linux/sctp.h
1651216507
F: include/linux/seq_file_net.h
1651316508
F: include/linux/skbuff*
1651416509
F: include/net/
@@ -16525,6 +16520,7 @@ F: include/uapi/linux/netdev*
1652516520
F: include/uapi/linux/netlink.h
1652616521
F: include/uapi/linux/netlink_diag.h
1652716522
F: include/uapi/linux/rtnetlink.h
16523+
F: include/uapi/linux/sctp.h
1652816524
F: lib/net_utils.c
1652916525
F: lib/random32.c
1653016526
F: net/
@@ -19355,7 +19351,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
1935519351
F: drivers/media/tuners/qt1010*
1935619352

1935719353
QUALCOMM ATH12K WIRELESS DRIVER
19358-
M: Kalle Valo <[email protected]>
1935919354
M: Jeff Johnson <[email protected]>
1936019355
L: [email protected]
1936119356
S: Supported
@@ -19365,7 +19360,6 @@ F: drivers/net/wireless/ath/ath12k/
1936519360
N: ath12k
1936619361

1936719362
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
19368-
M: Kalle Valo <[email protected]>
1936919363
M: Jeff Johnson <[email protected]>
1937019364
L: [email protected]
1937119365
S: Supported
@@ -19375,7 +19369,6 @@ F: drivers/net/wireless/ath/ath10k/
1937519369
N: ath10k
1937619370

1937719371
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
19378-
M: Kalle Valo <[email protected]>
1937919372
M: Jeff Johnson <[email protected]>
1938019373
L: [email protected]
1938119374
S: Supported
@@ -19510,6 +19503,15 @@ L: [email protected]
1951019503
S: Supported
1951119504
F: drivers/dma/qcom/hidma*
1951219505

19506+
QUALCOMM I2C QCOM GENI DRIVER
19507+
M: Mukesh Kumar Savaliya <[email protected]>
19508+
M: Viken Dadhaniya <[email protected]>
19509+
L: [email protected]
19510+
L: [email protected]
19511+
S: Maintained
19512+
F: Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml
19513+
F: drivers/i2c/busses/i2c-qcom-geni.c
19514+
1951319515
QUALCOMM I2C CCI DRIVER
1951419516
M: Loic Poulain <[email protected]>
1951519517
M: Robert Foss <[email protected]>

‎Makefile

+5-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 14
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*
@@ -1120,8 +1120,8 @@ LDFLAGS_vmlinux += --orphan-handling=$(CONFIG_LD_ORPHAN_WARN_LEVEL)
11201120
endif
11211121

11221122
# Align the bit size of userspace programs with the kernel
1123-
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1124-
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1123+
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1124+
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
11251125

11261126
# make the checker run with the right architecture
11271127
CHECKFLAGS += --arch=$(ARCH)
@@ -1421,18 +1421,13 @@ ifneq ($(wildcard $(resolve_btfids_O)),)
14211421
$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean
14221422
endif
14231423

1424-
# Clear a bunch of variables before executing the submake
1425-
ifeq ($(quiet),silent_)
1426-
tools_silent=s
1427-
endif
1428-
14291424
tools/: FORCE
14301425
$(Q)mkdir -p $(objtree)/tools
1431-
$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
1426+
$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
14321427

14331428
tools/%: FORCE
14341429
$(Q)mkdir -p $(objtree)/tools
1435-
$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*
1430+
$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*
14361431

14371432
# ---------------------------------------------------------------------------
14381433
# Kernel selftest

‎arch/alpha/include/asm/hwrpb.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ struct crb_struct {
135135
/* virtual->physical map */
136136
unsigned long map_entries;
137137
unsigned long map_pages;
138-
struct vf_map_struct map[1];
138+
struct vf_map_struct map[];
139139
};
140140

141141
struct memclust_struct {

‎arch/alpha/include/uapi/asm/ptrace.h

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ struct pt_regs {
4242
unsigned long trap_a0;
4343
unsigned long trap_a1;
4444
unsigned long trap_a2;
45+
/* This makes the stack 16-byte aligned as GCC expects */
46+
unsigned long __pad0;
4547
/* These are saved by PAL-code: */
4648
unsigned long ps;
4749
unsigned long pc;

0 commit comments

Comments
 (0)