Skip to content

Commit 496fa74

Browse files
author
Bartosz Golaszewski
committed
Merge tag 'v6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.14-rc7
2 parents 240ba5b + 4701f33 commit 496fa74

File tree

510 files changed

+5949
-2699
lines changed

Some content is hidden

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

510 files changed

+5949
-2699
lines changed

.mailmap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <[email protected]> <[email protected]>
8888
8989
9090
91-
9291
9392
9493
Archit Taneja <[email protected]>
@@ -282,6 +281,7 @@ Henrik Rydberg <[email protected]>
282281
Herbert Xu <[email protected]>
283282
284283
284+
285285
286286
287287
Jacob Shin <[email protected]>
@@ -692,6 +692,7 @@ Subbaraman Narayanamurthy <[email protected]> <[email protected]>
692692
Subhash Jadavani <[email protected]>
693693
Sudarshan Rajagopalan <[email protected]> <[email protected]>
694694
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
695+
695696
Sumit Semwal <[email protected]>
696697
697698

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Configuring the kernel
176176
values without prompting.
177177

178178
"make defconfig" Create a ./.config file by using the default
179-
symbol values from either arch/$ARCH/defconfig
179+
symbol values from either arch/$ARCH/configs/defconfig
180180
or arch/$ARCH/configs/${PLATFORM}_defconfig,
181181
depending on the architecture.
182182

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,17 @@ pid>/``).
212212
This value defaults to 0.
213213
214214

215+
core_sort_vma
216+
=============
217+
218+
The default coredump writes VMAs in address order. By setting
219+
``core_sort_vma`` to 1, VMAs will be written from smallest size
220+
to largest size. This is known to break at least elfutils, but
221+
can be handy when dealing with very large (and truncated)
222+
coredumps where the more useful debugging details are included
223+
in the smaller VMAs.
224+
225+
215226
core_uses_pid
216227
=============
217228

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ properties:
146146
maxItems: 2
147147

148148
pwm-names:
149+
minItems: 1
149150
items:
150151
- const: convst1
151152
- const: convst2

Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- imagis,ist3038
2020
- imagis,ist3038b
2121
- imagis,ist3038c
22+
- imagis,ist3038h
2223

2324
reg:
2425
maxItems: 1

Documentation/filesystems/idmappings.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ what id ``k11000`` corresponds to in the second or third idmapping. The
6363
straightforward algorithm to use is to apply the inverse of the first idmapping,
6464
mapping ``k11000`` up to ``u1000``. Afterwards, we can map ``u1000`` down using
6565
either the second idmapping mapping or third idmapping mapping. The second
66-
idmapping would map ``u1000`` down to ``21000``. The third idmapping would map
67-
``u1000`` down to ``u31000``.
66+
idmapping would map ``u1000`` down to ``k21000``. The third idmapping would map
67+
``u1000`` down to ``k31000``.
6868

6969
If we were given the same task for the following three idmappings::
7070

Documentation/rust/quick-start.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Rust standard library source
145145
****************************
146146

147147
The Rust standard library source is required because the build system will
148-
cross-compile ``core`` and ``alloc``.
148+
cross-compile ``core``.
149149

150150
If ``rustup`` is being used, run::
151151

Documentation/rust/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ operator are also supported as usual, e.g.:
9797
9898
/// ```
9999
/// # use kernel::{spawn_work_item, workqueue};
100-
/// spawn_work_item!(workqueue::system(), || pr_info!("x"))?;
100+
/// spawn_work_item!(workqueue::system(), || pr_info!("x\n"))?;
101101
/// # Ok::<(), Error>(())
102102
/// ```
103103

Documentation/scheduler/sched-rt-group.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ The system wide settings are configured under the /proc virtual file system:
102102
* sched_rt_period_us takes values from 1 to INT_MAX.
103103
* sched_rt_runtime_us takes values from -1 to sched_rt_period_us.
104104
* A run time of -1 specifies runtime == period, ie. no limit.
105+
* sched_rt_runtime_us/sched_rt_period_us > 0.05 inorder to preserve
106+
bandwidth for fair dl_server. For accurate value check average of
107+
runtime/period in /sys/kernel/debug/sched/fair_server/cpuX/
105108

106109

107110
2.2 Default behaviour

MAINTAINERS

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ F: include/net/ieee80211_radiotap.h
124124
F: include/net/iw_handler.h
125125
F: include/net/wext.h
126126
F: include/uapi/linux/nl80211.h
127+
N: include/uapi/linux/nl80211-.*
127128
F: include/uapi/linux/wireless.h
128129
F: net/wireless/
129130

@@ -514,7 +515,7 @@ F: drivers/hwmon/adm1029.c
514515
ADM8211 WIRELESS DRIVER
515516
516517
S: Orphan
517-
F: drivers/net/wireless/admtek/adm8211.*
518+
F: drivers/net/wireless/admtek/
518519

519520
ADP1050 HARDWARE MONITOR DRIVER
520521
M: Radu Sabau <[email protected]>
@@ -5775,6 +5776,7 @@ X: drivers/clk/clkdev.c
57755776

57765777
COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)
57775778
M: Steve French <[email protected]>
5779+
M: Steve French <[email protected]>
57785780
R: Paulo Alcantara <[email protected]> (DFS, global name space)
57795781
R: Ronnie Sahlberg <[email protected]> (directory leases, sparse files)
57805782
R: Shyam Prasad N <[email protected]> (multichannel)
@@ -6206,7 +6208,7 @@ F: Documentation/process/cve.rst
62066208

62076209
CW1200 WLAN driver
62086210
S: Orphan
6209-
F: drivers/net/wireless/st/cw1200/
6211+
F: drivers/net/wireless/st/
62106212
F: include/linux/platform_data/net-cw1200.h
62116213

62126214
CX18 VIDEO4LINUX DRIVER
@@ -9442,14 +9444,11 @@ F: include/linux/fscrypt.h
94429444
F: include/uapi/linux/fscrypt.h
94439445

94449446
FSI SUBSYSTEM
9445-
M: Jeremy Kerr <[email protected]>
9446-
M: Joel Stanley <[email protected]>
9447-
R: Alistar Popple <[email protected]>
9448-
R: Eddie James <[email protected]>
9447+
M: Eddie James <[email protected]>
9448+
R: Ninad Palsule <[email protected]>
94499449
94509450
S: Supported
94519451
Q: http://patchwork.ozlabs.org/project/linux-fsi/list/
9452-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git
94539452
F: drivers/fsi/
94549453
F: include/linux/fsi*.h
94559454
F: include/trace/events/fsi*.h
@@ -9830,7 +9829,6 @@ S: Maintained
98309829
F: drivers/media/usb/go7007/
98319830

98329831
GOODIX TOUCHSCREEN
9833-
M: Bastien Nocera <[email protected]>
98349832
M: Hans de Goede <[email protected]>
98359833
98369834
S: Maintained
@@ -11142,7 +11140,7 @@ S: Maintained
1114211140
F: drivers/i2c/busses/i2c-icy.c
1114311141

1114411142
IDEAPAD LAPTOP EXTRAS DRIVER
11145-
M: Ike Panhc <ike.pan@canonical.com>
11143+
M: Ike Panhc <ikepanhc@gmail.com>
1114611144
1114711145
S: Maintained
1114811146
W: http://launchpad.net/ideapad-laptop
@@ -12655,7 +12653,9 @@ F: tools/testing/selftests/
1265512653

1265612654
KERNEL SMB3 SERVER (KSMBD)
1265712655
M: Namjae Jeon <[email protected]>
12656+
M: Namjae Jeon <[email protected]>
1265812657
M: Steve French <[email protected]>
12658+
M: Steve French <[email protected]>
1265912659
R: Sergey Senozhatsky <[email protected]>
1266012660
R: Tom Talpey <[email protected]>
1266112661
@@ -12872,7 +12872,7 @@ F: include/keys/trusted_dcp.h
1287212872
F: security/keys/trusted-keys/trusted_dcp.c
1287312873

1287412874
KEYS-TRUSTED-TEE
12875-
M: Sumit Garg <sumit.garg@linaro.org>
12875+
M: Sumit Garg <sumit.garg@kernel.org>
1287612876
1287712877
1287812878
S: Supported
@@ -13994,6 +13994,7 @@ MARVELL LIBERTAS WIRELESS DRIVER
1399413994
1399513995
S: Orphan
1399613996
F: drivers/net/wireless/marvell/libertas/
13997+
F: drivers/net/wireless/marvell/libertas_tf/
1399713998

1399813999
MARVELL MACCHIATOBIN SUPPORT
1399914000
M: Russell King <[email protected]>
@@ -15663,7 +15664,7 @@ M: Ajay Singh <[email protected]>
1566315664
M: Claudiu Beznea <[email protected]>
1566415665
1566515666
S: Supported
15666-
F: drivers/net/wireless/microchip/wilc1000/
15667+
F: drivers/net/wireless/microchip/
1566715668

1566815669
MICROSEMI MIPS SOCS
1566915670
M: Alexandre Belloni <[email protected]>
@@ -16449,6 +16450,23 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
1644916450
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
1645016451
F: Documentation/devicetree/bindings/net/wireless/
1645116452
F: drivers/net/wireless/
16453+
X: drivers/net/wireless/ath/
16454+
X: drivers/net/wireless/broadcom/
16455+
X: drivers/net/wireless/intel/
16456+
X: drivers/net/wireless/intersil/
16457+
X: drivers/net/wireless/marvell/
16458+
X: drivers/net/wireless/mediatek/mt76/
16459+
X: drivers/net/wireless/mediatek/mt7601u/
16460+
X: drivers/net/wireless/microchip/
16461+
X: drivers/net/wireless/purelifi/
16462+
X: drivers/net/wireless/quantenna/
16463+
X: drivers/net/wireless/ralink/
16464+
X: drivers/net/wireless/realtek/
16465+
X: drivers/net/wireless/rsi/
16466+
X: drivers/net/wireless/silabs/
16467+
X: drivers/net/wireless/st/
16468+
X: drivers/net/wireless/ti/
16469+
X: drivers/net/wireless/zydas/
1645216470

1645316471
NETWORKING [DSA]
1645416472
M: Andrew Lunn <[email protected]>
@@ -17672,7 +17690,7 @@ F: Documentation/ABI/testing/sysfs-bus-optee-devices
1767217690
F: drivers/tee/optee/
1767317691

1767417692
OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
17675-
M: Sumit Garg <sumit.garg@linaro.org>
17693+
M: Sumit Garg <sumit.garg@kernel.org>
1767617694
1767717695
S: Maintained
1767817696
F: drivers/char/hw_random/optee-rng.c
@@ -17833,7 +17851,7 @@ M: Christian Lamparter <[email protected]>
1783317851
1783417852
S: Maintained
1783517853
W: https://wireless.wiki.kernel.org/en/users/Drivers/p54
17836-
F: drivers/net/wireless/intersil/p54/
17854+
F: drivers/net/wireless/intersil/
1783717855

1783817856
PACKET SOCKETS
1783917857
M: Willem de Bruijn <[email protected]>
@@ -19110,7 +19128,7 @@ PURELIFI PLFXLC DRIVER
1911019128
M: Srinivasan Raju <[email protected]>
1911119129
1911219130
S: Supported
19113-
F: drivers/net/wireless/purelifi/plfxlc/
19131+
F: drivers/net/wireless/purelifi/
1911419132

1911519133
PVRUSB2 VIDEO4LINUX DRIVER
1911619134
M: Mike Isely <[email protected]>
@@ -19661,7 +19679,7 @@ M: Igor Mitsyanko <[email protected]>
1966119679
R: Sergey Matyukevich <[email protected]>
1966219680
1966319681
S: Maintained
19664-
F: drivers/net/wireless/quantenna
19682+
F: drivers/net/wireless/quantenna/
1966519683

1966619684
RADEON and AMDGPU DRM DRIVERS
1966719685
M: Alex Deucher <[email protected]>
@@ -19741,7 +19759,7 @@ RALINK RT2X00 WIRELESS LAN DRIVER
1974119759
M: Stanislaw Gruszka <[email protected]>
1974219760
1974319761
S: Maintained
19744-
F: drivers/net/wireless/ralink/rt2x00/
19762+
F: drivers/net/wireless/ralink/
1974519763

1974619764
RAMDISK RAM BLOCK DEVICE DRIVER
1974719765
M: Jens Axboe <[email protected]>
@@ -21089,6 +21107,7 @@ F: include/linux/clk/samsung.h
2108921107

2109021108
SAMSUNG SPI DRIVERS
2109121109
M: Andi Shyti <[email protected]>
21110+
R: Tudor Ambarus <[email protected]>
2109221111
2109321112
2109421113
S: Maintained
@@ -21499,7 +21518,6 @@ F: include/linux/slimbus.h
2149921518

2150021519
SFC NETWORK DRIVER
2150121520
M: Edward Cree <[email protected]>
21502-
M: Martin Habets <[email protected]>
2150321521
2150421522
2150521523
S: Maintained
@@ -21708,7 +21726,7 @@ SILICON LABS WIRELESS DRIVERS (for WFxxx series)
2170821726
M: Jérôme Pouiller <[email protected]>
2170921727
S: Supported
2171021728
F: Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
21711-
F: drivers/net/wireless/silabs/wfx/
21729+
F: drivers/net/wireless/silabs/
2171221730

2171321731
SILICON MOTION SM712 FRAME BUFFER DRIVER
2171421732
M: Sudip Mukherjee <[email protected]>
@@ -23285,7 +23303,7 @@ F: include/media/i2c/tw9910.h
2328523303

2328623304
TEE SUBSYSTEM
2328723305
M: Jens Wiklander <[email protected]>
23288-
R: Sumit Garg <sumit.garg@linaro.org>
23306+
R: Sumit Garg <sumit.garg@kernel.org>
2328923307
2329023308
S: Maintained
2329123309
F: Documentation/ABI/testing/sysfs-class-tee
@@ -26208,7 +26226,7 @@ F: mm/zbud.c
2620826226
ZD1211RW WIRELESS DRIVER
2620926227
2621026228
S: Orphan
26211-
F: drivers/net/wireless/zydas/zd1211rw/
26229+
F: drivers/net/wireless/zydas/
2621226230

2621326231
ZD1301 MEDIA DRIVER
2621426232

0 commit comments

Comments
 (0)