Skip to content

Commit eee3929

Browse files
frank-wfrank-w
committed
Merge tag 'v5.10.246' into 5.10-main
This is the 5.10.246 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmkCEC0ACgkQONu9yGCS # aT5OyxAAveuXdtEVZI399AcTdbK0Y6WWQQJDaZPM6NjpMoBAot9YY9l8fXrmMgI2 # 8bfg4C6zE5rFVK4IdooZAChEyO9gSIpqEO4JO3pu/3gLVVD6gqIaduKwlo855A4D # onjKhNr+rIB+meq8YkQ0ovanm4vNgv1/g+T9YryYnYNxklhEcz24KcNGb5KoUVG3 # XCImAIsRi6A6jPmR6puxBpVSaT8S3CDbKA1vMByq/l+GmtrNS0JMv1bb0/G/iILq # kdPw4dvA9sJB78OfxoRrNbW1Iq1OJxRrj2BHFPetyFtuawhk1NsF2eME2mFRXrX6 # 5ePcOF/K8eocAvnuh3APuUl4hKXAMSxqGxfcjGadGoYDRZecWmhgPWAkkspBghff # j2+Bs/IQTI/fbDV86eC9JlhysAey2g+y1vrDr/v7i2piL1aYI24/tO4uvnubvFbh # pLP7Mt0irCApse64t6fbS58fVoXmGf6JhUKHMJbegHNoHDqWKh549MrGgQzGqKbD # Kk161ZrlIkjvjhwxvyzYw6bW5HSD1ZDyel+Fnd3CRDKMJlLDyDGxFm7e2Qv4gRqv # roQj4ARPI7UVickZY5F85889Zl07cXyU5ecVG6QZPt21VFLYSKmTbkOeHf/i/zIh # E6Hgypa/yD7047fKTrvC7JCe/+lQSo04Yi8jEBJYzNxyC3WDlTk= # =nH8a # -----END PGP SIGNATURE----- # gpg: Signature made Wed Oct 29 14:01:33 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 1b4c471 + df70e44 commit eee3929

File tree

372 files changed

+2798
-1320
lines changed

Some content is hidden

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

372 files changed

+2798
-1320
lines changed

‎Documentation/ABI/testing/sysfs-bus-pci‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,3 +377,12 @@ Contact: Heiner Kallweit <hkallweit1@gmail.com>
377377
Description: If ASPM is supported for an endpoint, these files can be
378378
used to disable or enable the individual power management
379379
states. Write y/1/on to enable, n/0/off to disable.
380+
381+
What: /sys/bus/pci/devices/.../power_state
382+
Date: November 2020
383+
Contact: Linux PCI developers <linux-pci@vger.kernel.org>
384+
Description:
385+
This file contains the current PCI power state of the device.
386+
The value comes from the PCI kernel device state and can be one
387+
of: "unknown", "error", "D0", D1", "D2", "D3hot", "D3cold".
388+
The file is read only.

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4846,6 +4846,9 @@
48464846

48474847
rootflags= [KNL] Set root filesystem mount option string
48484848

4849+
initramfs_options= [KNL]
4850+
Specify mount options for for the initramfs mount.
4851+
48494852
rootfstype= [KNL] Set root filesystem type
48504853

48514854
rootwait [KNL] Wait (indefinitely) for root device to show up.

‎Documentation/arm64/silicon-errata.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ stable kernels.
144144
+----------------+-----------------+-----------------+-----------------------------+
145145
| ARM | Neoverse-V3 | #3312417 | ARM64_ERRATUM_3194386 |
146146
+----------------+-----------------+-----------------+-----------------------------+
147+
| ARM | Neoverse-V3AE | #3312417 | ARM64_ERRATUM_3194386 |
148+
+----------------+-----------------+-----------------+-----------------------------+
147149
| ARM | MMU-500 | #841119,826419 | N/A |
148150
+----------------+-----------------+-----------------+-----------------------------+
149151
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/trace/histogram-design.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,9 @@ entry, ts0, corresponding to the ts0 variable in the sched_waking
380380
trigger above.
381381

382382
sched_waking histogram
383-
----------------------::
383+
----------------------
384+
385+
.. code-block::
384386
385387
+------------------+
386388
| hist_data |<-------------------------------------------------------+

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 10
4-
SUBLEVEL = 245
4+
SUBLEVEL = 246
55
EXTRAVERSION =
66
NAME = Dare mighty things
77

‎arch/arm/mach-omap2/pm33xx-core.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,15 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
393393
if (!state_node)
394394
break;
395395

396-
if (!of_device_is_available(state_node))
396+
if (!of_device_is_available(state_node)) {
397+
of_node_put(state_node);
397398
continue;
399+
}
398400

399401
if (i == CPUIDLE_STATE_MAX) {
400402
pr_warn("%s: cpuidle states reached max possible\n",
401403
__func__);
404+
of_node_put(state_node);
402405
break;
403406
}
404407

@@ -408,6 +411,7 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
408411
states[state_count].wfi_flags |= WFI_FLAG_WAKE_M3 |
409412
WFI_FLAG_FLUSH_CACHE;
410413

414+
of_node_put(state_node);
411415
state_count++;
412416
}
413417

‎arch/arm/mm/pageattr.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static int change_page_range(pte_t *ptep, unsigned long addr, void *data)
2525
return 0;
2626
}
2727

28-
static bool in_range(unsigned long start, unsigned long size,
28+
static bool range_in_range(unsigned long start, unsigned long size,
2929
unsigned long range_start, unsigned long range_end)
3030
{
3131
return start >= range_start && start < range_end &&
@@ -46,8 +46,8 @@ static int change_memory_common(unsigned long addr, int numpages,
4646
if (!size)
4747
return 0;
4848

49-
if (!in_range(start, size, MODULES_VADDR, MODULES_END) &&
50-
!in_range(start, size, VMALLOC_START, VMALLOC_END))
49+
if (!range_in_range(start, size, MODULES_VADDR, MODULES_END) &&
50+
!range_in_range(start, size, VMALLOC_START, VMALLOC_END))
5151
return -EINVAL;
5252

5353
data.set_mask = set_mask;

‎arch/arm64/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ config ARM64_ERRATUM_3194386
718718
* ARM Neoverse-V1 erratum 3324341
719719
* ARM Neoverse V2 erratum 3324336
720720
* ARM Neoverse-V3 erratum 3312417
721+
* ARM Neoverse-V3AE erratum 3312417
721722

722723
On affected cores "MSR SSBS, #0" instructions may not affect
723724
subsequent speculative instructions, which may permit unexepected

‎arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/ {
1313
model = "Pumpkin MT8516";
14-
compatible = "mediatek,mt8516";
14+
compatible = "mediatek,mt8516-pumpkin", "mediatek,mt8516";
1515

1616
memory@40000000 {
1717
device_type = "memory";

‎arch/arm64/boot/dts/qcom/msm8916.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,8 @@
899899

900900
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
901901

902+
resets = <&gcc GCC_MDSS_BCR>;
903+
902904
interrupt-controller;
903905
#interrupt-cells = <1>;
904906

0 commit comments

Comments
 (0)