Skip to content

Commit c58322e

Browse files
frank-wfrank-w
committed
Merge tag 'v6.1.159' into 6.1-main
This is the 6.1.159 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmk0nYYACgkQONu9yGCS # aT7NyQ//a425cDG/bzq/v/8kvWhPEOz84lKYSfAottl70j/vjPGM0pDTEuOH8nUg # mv400iHw1sjpImDarH0uLuN337ZUhyAjoL3+MEOCZOlwd0LoeIcr6xgnLIN4V3rB # 8UkGcr2NW4/CdpzT2fSLQIdBqDQ5+mb+99oonvpr0SogmPgL0QuKnuFHH0Anzi9I # rTFmU42WBIfLh5TZuaaf9TxgOW57RpX8qUvfd6Q25lInxSCj/aqqknPkXr6fiIDh # grK65hISTtfnkuyEscRJKvoNCh4C0CCeI7BWEkDnDkwJBfOgnlLywxOiYYJ84gFL # 30V0dzqrJLwGPE8lBlecBDIAPVCQJg2ZeKKTZutzU7MVAOEqjB2AVSCLau5swsyG # 4yu0Cve77Ml3qJLE5OgqxseHsrloGM8QBWW3InUCQpd7iBrPbum3KIMx9EuzrVnk # GrDtEBQae7p+VIUBDz7bdMdzSONOF1lwkvRN/OUQ09HZabHVifm/csFcg3aLbfUh # fYsj/RF1yT3j8mJT0j+kSp3RvGQ/VmS7agT5y1RtjcU4Swhp7UUHGOjAuT7N2II6 # 1MRqFOd5bMlr6Zxi5wNoEKmp7D5qnaMsfiGuGlHJzEow2hX3sFQMnM1aoR0v7kGn # etzm+UG3jMXwx44xhVK2Vh1AVcxsygnWpzPPy1F5bfJHJZsBBP4= # =IWE8 # -----END PGP SIGNATURE----- # gpg: Signature made Sat Dec 6 22:17:58 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents eb29135 + 50cbba1 commit c58322e

File tree

678 files changed

+5740
-30290
lines changed

Some content is hidden

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

678 files changed

+5740
-30290
lines changed

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,65 @@ Description:
2323
Reading this attribute gives the state of the DbC. It
2424
can be one of the following states: disabled, enabled,
2525
initialized, connected, configured and stalled.
26+
27+
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_idVendor
28+
Date: March 2023
29+
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
30+
Description:
31+
This dbc_idVendor attribute lets us change the idVendor field
32+
presented in the USB device descriptor by this xhci debug
33+
device.
34+
Value can only be changed while debug capability (DbC) is in
35+
disabled state to prevent USB device descriptor change while
36+
connected to a USB host.
37+
The default value is 0x1d6b (Linux Foundation).
38+
It can be any 16-bit integer.
39+
40+
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_idProduct
41+
Date: March 2023
42+
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
43+
Description:
44+
This dbc_idProduct attribute lets us change the idProduct field
45+
presented in the USB device descriptor by this xhci debug
46+
device.
47+
Value can only be changed while debug capability (DbC) is in
48+
disabled state to prevent USB device descriptor change while
49+
connected to a USB host.
50+
The default value is 0x0010. It can be any 16-bit integer.
51+
52+
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_bcdDevice
53+
Date: March 2023
54+
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
55+
Description:
56+
This dbc_bcdDevice attribute lets us change the bcdDevice field
57+
presented in the USB device descriptor by this xhci debug
58+
device.
59+
Value can only be changed while debug capability (DbC) is in
60+
disabled state to prevent USB device descriptor change while
61+
connected to a USB host.
62+
The default value is 0x0010. (device rev 0.10)
63+
It can be any 16-bit integer.
64+
65+
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_bInterfaceProtocol
66+
Date: March 2023
67+
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
68+
Description:
69+
This attribute lets us change the bInterfaceProtocol field
70+
presented in the USB Interface descriptor by the xhci debug
71+
device.
72+
Value can only be changed while debug capability (DbC) is in
73+
disabled state to prevent USB descriptor change while
74+
connected to a USB host.
75+
The default value is 1 (GNU Remote Debug command).
76+
Other permissible value is 0 which is for vendor defined debug
77+
target.
78+
79+
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_poll_interval_ms
80+
Date: February 2024
81+
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
82+
Description:
83+
This attribute adjust the polling interval used to check for
84+
DbC events. Unit is milliseconds. Accepted values range from 0
85+
up to 5000. The default value is 64 ms.
86+
This polling interval is used while DbC is enabled but has no
87+
active data transfers.

‎Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ patternProperties:
5050
groups:
5151
description:
5252
Name of the pin group to use for the functions.
53-
$ref: "/schemas/types.yaml#/definitions/string"
54-
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
55-
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
56-
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
57-
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
58-
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
59-
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
60-
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
61-
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
62-
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
63-
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
64-
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
53+
items:
54+
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
55+
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
56+
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
57+
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
58+
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
59+
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
60+
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
61+
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
62+
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
63+
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
64+
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
65+
minItems: 1
66+
maxItems: 8
6567

6668
drive-strength:
6769
enum: [2, 4, 6, 8, 16, 24, 32]

‎Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,20 @@ required:
8282
- reg
8383
- "#address-cells"
8484
- "#size-cells"
85-
- dma-ranges
8685
- ranges
8786
- clocks
8887
- clock-names
8988
- interrupts
9089

90+
allOf:
91+
- if:
92+
properties:
93+
compatible:
94+
const: fsl,imx8mp-dwc3
95+
then:
96+
required:
97+
- dma-ranges
98+
9199
additionalProperties: false
92100

93101
examples:

‎MAINTAINERS‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14221,6 +14221,7 @@ NETDEVSIM
1422114221
M: Jakub Kicinski <kuba@kernel.org>
1422214222
S: Maintained
1422314223
F: drivers/net/netdevsim/*
14224+
F: tools/testing/selftests/drivers/net/netdevsim/*
1422414225

1422514226
NETEM NETWORK EMULATOR
1422614227
M: Stephen Hemminger <stephen@networkplumber.org>
@@ -19601,12 +19602,6 @@ R: Pavel Skripkin <paskripkin@gmail.com>
1960119602
S: Supported
1960219603
F: drivers/staging/r8188eu/
1960319604

19604-
STAGING - REALTEK RTL8712U DRIVERS
19605-
M: Larry Finger <Larry.Finger@lwfinger.net>
19606-
M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
19607-
S: Odd Fixes
19608-
F: drivers/staging/rtl8712/
19609-
1961019605
STAGING - SEPS525 LCD CONTROLLER DRIVERS
1961119606
M: Michael Hennerich <michael.hennerich@analog.com>
1961219607
L: linux-fbdev@vger.kernel.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 = 1
4-
SUBLEVEL = 158
4+
SUBLEVEL = 159
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/alpha/kernel/asm-offsets.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* This code generates raw asm output which is post-processed to extract
55
* and format the required data.
66
*/
7+
#define COMPILE_OFFSETS
78

89
#include <linux/types.h>
910
#include <linux/stddef.h>

‎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/arc/kernel/asm-offsets.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/*
33
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
44
*/
5+
#define COMPILE_OFFSETS
56

67
#include <linux/sched.h>
78
#include <linux/mm.h>

‎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/kernel/asm-offsets.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* This code generates raw asm output which is post-processed to extract
88
* and format the required data.
99
*/
10+
#define COMPILE_OFFSETS
11+
1012
#include <linux/compiler.h>
1113
#include <linux/sched.h>
1214
#include <linux/mm.h>

0 commit comments

Comments
 (0)