Skip to content

Commit c6f3bff

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.117' into 6.6-main
This is the 6.6.117 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmkkJa0ACgkQONu9yGCS # aT4H8Q/+KFBYXk40ZcClvzx60Ghz/ox/YVHM9X1PFAjHvzu0hGITDDVqSmnU8ZBT # VI0LZbDqbUlkXyetDRqmBCwTIq1kvLVfOAYdyFKpt5PtTjdbqWpdZhkbkGHR6+Q+ # zP5IxysksBmgyRr25tVK3yOQ0IMYPo9CR+FelfAvIeNrNXBnEFuhfBC7xDCJj2ah # gmmpTuQW/kcrVBFxrPuo/3GwBcYG7MclrGgiCBGmUHQkW9POhvNENIRbP5TiXZvd # oRFTTlQR6i4DnvioalwhpheYlHIA6QQ47VyRTf/orNnvXsA//Q4ZejrGjc0QYNrD # uzFFSBx3l0XyMNurxor/5QttlHWIYVFI76mQ2KPA9OmFcnEiKTx2tAxNcRN5/Gof # r07ZVzjfpMFGaX5dYNgpGDiFFqKx6A2uhHF0ICcrraBiJUX3S0YFOXAdP5ksJAJ1 # arTKelo2KfARl9KCvfjahdyzG0qwEOTmwWOqhYsuTpcMrCkU9TLNaKXxCbm6+YRK # Ju626mYe3QH/AHh4AGIMMIEfGOKlE8xJd3ECnqI3AXVhZgx88/SeJbs3NLhGCH6y # FbuiGSF0NDzHOFjzzwmeKF85JAKO0asAJRHPv41ZzPHQBEUmX9Xlqs/ocpxRONup # eITVba1QwISM3jFF8Adgz6eQHMGrmpWnVIPfC2GnbrkZ4SPPLaY= # =YMzd # -----END PGP SIGNATURE----- # gpg: Signature made Mon Nov 24 10:30:21 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 7121567 + 1e89a1b commit c6f3bff

503 files changed

Lines changed: 4860 additions & 2077 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/admin-guide/cgroup-v2.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,15 @@ PAGE_SIZE multiple when read back.
15321532
collapsing an existing range of pages. This counter is not
15331533
present when CONFIG_TRANSPARENT_HUGEPAGE is not set.
15341534

1535+
thp_swpout (npn)
1536+
Number of transparent hugepages which are swapout in one piece
1537+
without splitting.
1538+
1539+
thp_swpout_fallback (npn)
1540+
Number of transparent hugepages which were split before swapout.
1541+
Usually because failed to allocate some continuous swap space
1542+
for the huge page.
1543+
15351544
memory.numa_stat
15361545
A read-only nested-keyed file which exists on non-root cgroups.
15371546

‎MAINTAINERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14725,6 +14725,7 @@ NETDEVSIM
1472514725
M: Jakub Kicinski <kuba@kernel.org>
1472614726
S: Maintained
1472714727
F: drivers/net/netdevsim/*
14728+
F: tools/testing/selftests/drivers/net/netdevsim/*
1472814729

1472914730
NETEM NETWORK EMULATOR
1473014731
M: Stephen Hemminger <stephen@networkplumber.org>

‎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 = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 116
4+
SUBLEVEL = 117
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/arc/include/asm/bitops.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ static inline __attribute__ ((const)) int fls(unsigned int x)
133133
*/
134134
static inline __attribute__ ((const)) unsigned long __fls(unsigned long x)
135135
{
136+
if (__builtin_constant_p(x))
137+
return x ? BITS_PER_LONG - 1 - __builtin_clzl(x) : 0;
136138
/* FLS insn has exactly same semantics as the API */
137139
return __builtin_arc_fls(x);
138140
}

‎arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
mdio {
5656
/delete-node/ switch@1e;
5757

58-
bcm54210e: ethernet-phy@0 {
59-
reg = <0>;
58+
bcm54210e: ethernet-phy@25 {
59+
reg = <25>;
6060
};
6161
};
6262
};

‎arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,9 @@
502502
compatible = "asahi-kasei,ak8974";
503503
reg = <0xe>;
504504

505+
interrupt-parent = <&gpio>;
506+
interrupts = <TEGRA_GPIO(N, 5) IRQ_TYPE_EDGE_RISING>;
507+
505508
avdd-supply = <&vdd_3v3_sys>;
506509
dvdd-supply = <&vdd_1v8_sys>;
507510

@@ -515,7 +518,7 @@
515518
reg = <0x1a>;
516519

517520
interrupt-parent = <&gpio>;
518-
interrupts = <TEGRA_GPIO(X, 1) IRQ_TYPE_EDGE_BOTH>;
521+
interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_BOTH>;
519522

520523
gpio-controller;
521524
#gpio-cells = <2>;

‎arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
pinctrl-0 = <&pinctrl_audmux>;
260260
status = "okay";
261261

262-
ssi2 {
262+
mux-ssi2 {
263263
fsl,audmux-port = <1>;
264264
fsl,port-config = <
265265
(IMX_AUDMUX_V2_PTCR_SYN |
@@ -271,7 +271,7 @@
271271
>;
272272
};
273273

274-
aud3 {
274+
mux-aud3 {
275275
fsl,audmux-port = <2>;
276276
fsl,port-config = <
277277
IMX_AUDMUX_V2_PTCR_SYN

‎arch/arm/crypto/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ menu "Accelerated Cryptographic Algorithms for CPU (arm)"
44

55
config CRYPTO_CURVE25519_NEON
66
tristate "Public key crypto: Curve25519 (NEON)"
7-
depends on KERNEL_MODE_NEON
7+
depends on KERNEL_MODE_NEON && !CPU_BIG_ENDIAN
88
select CRYPTO_LIB_CURVE25519_GENERIC
99
select CRYPTO_ARCH_HAVE_LIB_CURVE25519
1010
help

‎arch/arm/mach-at91/pm_suspend.S‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,10 @@ sr_dis_exit:
689689
bic tmp2, tmp2, #AT91_PMC_PLL_UPDT_ID
690690
str tmp2, [pmc, #AT91_PMC_PLL_UPDT]
691691

692+
/* save acr */
693+
ldr tmp2, [pmc, #AT91_PMC_PLL_ACR]
694+
str tmp2, .saved_acr
695+
692696
/* save div. */
693697
mov tmp1, #0
694698
ldr tmp2, [pmc, #AT91_PMC_PLL_CTRL0]
@@ -758,7 +762,7 @@ sr_dis_exit:
758762
str tmp1, [pmc, #AT91_PMC_PLL_UPDT]
759763

760764
/* step 2. */
761-
ldr tmp1, =AT91_PMC_PLL_ACR_DEFAULT_PLLA
765+
ldr tmp1, .saved_acr
762766
str tmp1, [pmc, #AT91_PMC_PLL_ACR]
763767

764768
/* step 3. */
@@ -1134,6 +1138,8 @@ ENDPROC(at91_pm_suspend_in_sram)
11341138
.word 0
11351139
.saved_mckr:
11361140
.word 0
1141+
.saved_acr:
1142+
.word 0
11371143
.saved_pllar:
11381144
.word 0
11391145
.saved_sam9_lpr:

‎arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@
482482
};
483483

484484
&i2s1_8ch {
485+
pinctrl-names = "default";
486+
pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
485487
rockchip,trcm-sync-tx-only;
486488
status = "okay";
487489
};

0 commit comments

Comments
 (0)