Skip to content

Commit 4df8183

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.14.y' into v6.14+
2 parents 3548236 + 372ad89 commit 4df8183

1,080 files changed

Lines changed: 12338 additions & 5701 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/kernel-parameters.txt‎

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

66156615
Selecting 'on' will also enable the mitigation
66166616
against user space to user space task attacks.
6617+
Selecting specific mitigation does not force enable
6618+
user mitigations.
66176619

66186620
Selecting 'off' will disable both the kernel and
66196621
the user space protections.

‎Documentation/driver-api/pps.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ To do so the class pps-gen has been added. PPS generators can be
206206
registered in the kernel by defining a struct pps_gen_source_info as
207207
follows::
208208

209-
static struct pps_gen_source_info pps_gen_dummy_info = {
210-
.name = "dummy",
209+
static const struct pps_gen_source_info pps_gen_dummy_info = {
211210
.use_system_clock = true,
212211
.get_time = pps_gen_dummy_get_time,
213212
.enable = pps_gen_dummy_enable,

‎Documentation/driver-api/serial/driver.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ Some helpers are provided in order to set/get modem control lines via GPIO.
103103
.. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c
104104
:identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod
105105
mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms
106-
mctrl_gpio_disable_ms
106+
mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync

‎Documentation/hwmon/dell-smm-hwmon.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ Temperature sensors and fans can be queried and set via the standard
3232
=============================== ======= =======================================
3333
Name Perm Description
3434
=============================== ======= =======================================
35-
fan[1-3]_input RO Fan speed in RPM.
36-
fan[1-3]_label RO Fan label.
37-
fan[1-3]_min RO Minimal Fan speed in RPM
38-
fan[1-3]_max RO Maximal Fan speed in RPM
39-
fan[1-3]_target RO Expected Fan speed in RPM
40-
pwm[1-3] RW Control the fan PWM duty-cycle.
35+
fan[1-4]_input RO Fan speed in RPM.
36+
fan[1-4]_label RO Fan label.
37+
fan[1-4]_min RO Minimal Fan speed in RPM
38+
fan[1-4]_max RO Maximal Fan speed in RPM
39+
fan[1-4]_target RO Expected Fan speed in RPM
40+
pwm[1-4] RW Control the fan PWM duty-cycle.
4141
pwm1_enable WO Enable or disable automatic BIOS fan
4242
control (not supported on all laptops,
4343
see below for details).
@@ -93,7 +93,7 @@ Again, when you find new codes, we'd be happy to have your patches!
9393
---------------------------
9494

9595
The driver also exports the fans as thermal cooling devices with
96-
``type`` set to ``dell-smm-fan[1-3]``. This allows for easy fan control
96+
``type`` set to ``dell-smm-fan[1-4]``. This allows for easy fan control
9797
using one of the thermal governors.
9898

9999
Module parameters

‎Documentation/networking/net_cachelines/snmp.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ unsigned_long LINUX_MIB_TIMEWAITRECYCLED
3636
unsigned_long LINUX_MIB_TIMEWAITKILLED
3737
unsigned_long LINUX_MIB_PAWSACTIVEREJECTED
3838
unsigned_long LINUX_MIB_PAWSESTABREJECTED
39+
unsigned_long LINUX_MIB_TSECR_REJECTED
3940
unsigned_long LINUX_MIB_DELAYEDACKLOST
4041
unsigned_long LINUX_MIB_LISTENOVERFLOWS
4142
unsigned_long LINUX_MIB_LISTENDROPS

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 14
4-
SUBLEVEL = 8
4+
SUBLEVEL = 9
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -1053,10 +1053,6 @@ NOSTDINC_FLAGS += -nostdinc
10531053
# perform bounds checking.
10541054
KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3)
10551055

1056-
#Currently, disable -Wstringop-overflow for GCC 11, globally.
1057-
KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow)
1058-
KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)
1059-
10601056
# disable invalid "can't wrap" optimizations for signed / pointers
10611057
KBUILD_CFLAGS += -fno-strict-overflow
10621058

‎arch/arm/boot/dts/nvidia/tegra114.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
reg = <0x54400000 0x00040000>;
140140
clocks = <&tegra_car TEGRA114_CLK_DSIB>,
141141
<&tegra_car TEGRA114_CLK_DSIBLP>,
142-
<&tegra_car TEGRA114_CLK_PLL_D2_OUT0>;
142+
<&tegra_car TEGRA114_CLK_PLL_D_OUT0>;
143143
clock-names = "dsi", "lp", "parent";
144144
resets = <&tegra_car 82>;
145145
reset-names = "dsi";

‎arch/arm/mach-at91/pm.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,12 @@ extern u32 at91_pm_suspend_in_sram_sz;
545545

546546
static int at91_suspend_finish(unsigned long val)
547547
{
548-
unsigned char modified_gray_code[] = {
549-
0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x04, 0x05, 0x0c, 0x0d,
550-
0x0e, 0x0f, 0x0a, 0x0b, 0x08, 0x09, 0x18, 0x19, 0x1a, 0x1b,
551-
0x1e, 0x1f, 0x1c, 0x1d, 0x14, 0x15, 0x16, 0x17, 0x12, 0x13,
552-
0x10, 0x11,
548+
/* SYNOPSYS workaround to fix a bug in the calibration logic */
549+
unsigned char modified_fix_code[] = {
550+
0x00, 0x01, 0x01, 0x06, 0x07, 0x0c, 0x06, 0x07, 0x0b, 0x18,
551+
0x0a, 0x0b, 0x0c, 0x0d, 0x0d, 0x0a, 0x13, 0x13, 0x12, 0x13,
552+
0x14, 0x15, 0x15, 0x12, 0x18, 0x19, 0x19, 0x1e, 0x1f, 0x14,
553+
0x1e, 0x1f,
553554
};
554555
unsigned int tmp, index;
555556
int i;
@@ -560,25 +561,25 @@ static int at91_suspend_finish(unsigned long val)
560561
* restore the ZQ0SR0 with the value saved here. But the
561562
* calibration is buggy and restoring some values from ZQ0SR0
562563
* is forbidden and risky thus we need to provide processed
563-
* values for these (modified gray code values).
564+
* values for these.
564565
*/
565566
tmp = readl(soc_pm.data.ramc_phy + DDR3PHY_ZQ0SR0);
566567

567568
/* Store pull-down output impedance select. */
568569
index = (tmp >> DDR3PHY_ZQ0SR0_PDO_OFF) & 0x1f;
569-
soc_pm.bu->ddr_phy_calibration[0] = modified_gray_code[index];
570+
soc_pm.bu->ddr_phy_calibration[0] = modified_fix_code[index] << DDR3PHY_ZQ0SR0_PDO_OFF;
570571

571572
/* Store pull-up output impedance select. */
572573
index = (tmp >> DDR3PHY_ZQ0SR0_PUO_OFF) & 0x1f;
573-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
574+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SR0_PUO_OFF;
574575

575576
/* Store pull-down on-die termination impedance select. */
576577
index = (tmp >> DDR3PHY_ZQ0SR0_PDODT_OFF) & 0x1f;
577-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
578+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SR0_PDODT_OFF;
578579

579580
/* Store pull-up on-die termination impedance select. */
580581
index = (tmp >> DDR3PHY_ZQ0SRO_PUODT_OFF) & 0x1f;
581-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
582+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SRO_PUODT_OFF;
582583

583584
/*
584585
* The 1st 8 words of memory might get corrupted in the process

‎arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,28 +152,12 @@
152152
vcc-pg-supply = <&reg_aldo1>;
153153
};
154154

155-
&r_ir {
156-
linux,rc-map-name = "rc-beelink-gs1";
157-
status = "okay";
158-
};
159-
160-
&r_pio {
161-
/*
162-
* FIXME: We can't add that supply for now since it would
163-
* create a circular dependency between pinctrl, the regulator
164-
* and the RSB Bus.
165-
*
166-
* vcc-pl-supply = <&reg_aldo1>;
167-
*/
168-
vcc-pm-supply = <&reg_aldo1>;
169-
};
170-
171-
&r_rsb {
155+
&r_i2c {
172156
status = "okay";
173157

174-
axp805: pmic@745 {
158+
axp805: pmic@36 {
175159
compatible = "x-powers,axp805", "x-powers,axp806";
176-
reg = <0x745>;
160+
reg = <0x36>;
177161
interrupt-parent = <&r_intc>;
178162
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
179163
interrupt-controller;
@@ -291,6 +275,22 @@
291275
};
292276
};
293277

278+
&r_ir {
279+
linux,rc-map-name = "rc-beelink-gs1";
280+
status = "okay";
281+
};
282+
283+
&r_pio {
284+
/*
285+
* PL0 and PL1 are used for PMIC I2C
286+
* don't enable the pl-supply else
287+
* it will fail at boot
288+
*
289+
* vcc-pl-supply = <&reg_aldo1>;
290+
*/
291+
vcc-pm-supply = <&reg_aldo1>;
292+
};
293+
294294
&spdif {
295295
pinctrl-names = "default";
296296
pinctrl-0 = <&spdif_tx_pin>;

‎arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,12 @@
176176
vcc-pg-supply = <&reg_vcc_wifi_io>;
177177
};
178178

179-
&r_ir {
180-
status = "okay";
181-
};
182-
183-
&r_rsb {
179+
&r_i2c {
184180
status = "okay";
185181

186-
axp805: pmic@745 {
182+
axp805: pmic@36 {
187183
compatible = "x-powers,axp805", "x-powers,axp806";
188-
reg = <0x745>;
184+
reg = <0x36>;
189185
interrupt-parent = <&r_intc>;
190186
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
191187
interrupt-controller;
@@ -296,6 +292,10 @@
296292
};
297293
};
298294

295+
&r_ir {
296+
status = "okay";
297+
};
298+
299299
&rtc {
300300
clocks = <&ext_osc32k>;
301301
};

0 commit comments

Comments
 (0)