Skip to content

Commit 7eb4b3d

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into v6.12+
2 parents b0a31e0 + e9d65b4 commit 7eb4b3d

704 files changed

Lines changed: 15263 additions & 8422 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.

Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,17 @@ Description:
163163
will be present in sysfs. Writing 1 to this file
164164
will perform reset.
165165

166+
What: /sys/bus/pci/devices/.../reset_subordinate
167+
Date: October 2024
168+
169+
Description:
170+
This is visible only for bridge devices. If you want to reset
171+
all devices attached through the subordinate bus of a specific
172+
bridge device, writing 1 to this will try to do it. This will
173+
affect all devices attached to the system through this bridge
174+
similiar to writing 1 to their individual "reset" file, so use
175+
with caution.
176+
166177
What: /sys/bus/pci/devices/.../vpd
167178
Date: February 2008
168179
Contact: Ben Hutchings <[email protected]>

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,3 +822,9 @@ Description: It controls the valid block ratio threshold not to trigger excessiv
822822
for zoned deivces. The initial value of it is 95(%). F2FS will stop the
823823
background GC thread from intiating GC for sections having valid blocks
824824
exceeding the ratio.
825+
826+
What: /sys/fs/f2fs/<disk>/max_read_extent_count
827+
Date: November 2024
828+
Contact: "Chao Yu" <[email protected]>
829+
Description: It controls max read extent count for per-inode, the value of threshold
830+
is 10240 by default.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.. SPDX-License-Identifier: GPL-2.0-only
2+
3+
===============================
4+
Qualcomm Cloud AI 80 (AIC080)
5+
===============================
6+
7+
Overview
8+
========
9+
10+
The Qualcomm Cloud AI 80/AIC080 family of products are a derivative of AIC100.
11+
The number of NSPs and clock rates are reduced to fit within resource
12+
constrained solutions. The PCIe Product ID is 0xa080.
13+
14+
As a derivative product, all AIC100 documentation applies.

Documentation/accel/qaic/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ accelerator cards.
1010
.. toctree::
1111

1212
qaic
13+
aic080
1314
aic100

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ stable kernels.
258258
| Hisilicon | Hip{08,09,10,10C| #162001900 | N/A |
259259
| | ,11} SMMU PMCG | | |
260260
+----------------+-----------------+-----------------+-----------------------------+
261+
| Hisilicon | Hip09 | #162100801 | HISILICON_ERRATUM_162100801 |
262+
+----------------+-----------------+-----------------+-----------------------------+
261263
+----------------+-----------------+-----------------+-----------------------------+
262264
| Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |
263265
+----------------+-----------------+-----------------+-----------------------------+

Documentation/i2c/busses/i2c-i801.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Supported adapters:
4949
* Intel Meteor Lake (SOC and PCH)
5050
* Intel Birch Stream (SOC)
5151
* Intel Arrow Lake (SOC)
52+
* Intel Panther Lake (SOC)
5253

5354
Datasheets: Publicly available at the Intel website
5455

Documentation/netlink/specs/ethtool.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,12 @@ attribute-sets:
9696
name: bits
9797
type: nest
9898
nested-attributes: bitset-bits
99-
99+
-
100+
name: value
101+
type: binary
102+
-
103+
name: mask
104+
type: binary
100105
-
101106
name: string
102107
attributes:

Documentation/networking/ip-sysctl.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,6 +2170,12 @@ nexthop_compat_mode - BOOLEAN
21702170
understands the new API, this sysctl can be disabled to achieve full
21712171
performance benefits of the new API by disabling the nexthop expansion
21722172
and extraneous notifications.
2173+
2174+
Note that as a backward-compatible mode, dumping of modern features
2175+
might be incomplete or wrong. For example, resilient groups will not be
2176+
shown as such, but rather as just a list of next hops. Also weights that
2177+
do not fit into 8 bits will show incorrectly.
2178+
21732179
Default: true (backward compat mode)
21742180

21752181
fib_notify_on_flag_change - INTEGER

Documentation/power/runtime_pm.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:
347347

348348
`int pm_runtime_resume_and_get(struct device *dev);`
349349
- run pm_runtime_resume(dev) and if successful, increment the device's
350-
usage counter; return the result of pm_runtime_resume
350+
usage counter; returns 0 on success (whether or not the device's
351+
runtime PM status was already 'active') or the error code from
352+
pm_runtime_resume() on failure.
351353

352354
`int pm_request_idle(struct device *dev);`
353355
- submit a request to execute the subsystem-level idle callback for the

Makefile

Lines changed: 2 additions & 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 = 12
4-
SUBLEVEL = 4
4+
SUBLEVEL = 6
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -456,6 +456,7 @@ export rust_common_flags := --edition=2021 \
456456
-Wclippy::mut_mut \
457457
-Wclippy::needless_bitwise_bool \
458458
-Wclippy::needless_continue \
459+
-Aclippy::needless_lifetimes \
459460
-Wclippy::no_mangle_with_rust_abi \
460461
-Wclippy::dbg_macro
461462

0 commit comments

Comments
 (0)