Skip to content

Commit 6cc62b9

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.19 to 5.19.12 (coolsnowwolf#10192)
2 parents 6d03d37 + 2b67b80 commit 6cc62b9

10 files changed

+16
-16
lines changed

include/kernel-5.19

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.19 = .11
2-
LINUX_KERNEL_HASH-5.19.11 = 5554d2f90b806bb3454fcf3432882cf85077d660a89db5a4e8d7375271e3d973
1+
LINUX_VERSION-5.19 = .12
2+
LINUX_KERNEL_HASH-5.19.12 = c436a548c7312ce6fc5a3472cbead895eef8f52841fbe7c71fd8e48bdfe2b0ba

target/linux/generic/backport-5.19/002-struct-net_device.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size);
6363
--- a/net/batman-adv/hard-interface.c
6464
+++ b/net/batman-adv/hard-interface.c
65-
@@ -307,11 +307,9 @@ static bool batadv_is_cfg80211_netdev(st
65+
@@ -308,11 +308,9 @@ static bool batadv_is_cfg80211_netdev(st
6666
if (!net_device)
6767
return false;
6868

target/linux/generic/hack-5.19/221-module_exports.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
5656
} \
5757
\
5858
/* __*init sections */ \
59-
@@ -1024,6 +1034,8 @@
59+
@@ -1023,6 +1033,8 @@
6060

6161
#define COMMON_DISCARDS \
6262
SANITIZER_DISCARDS \

target/linux/generic/hack-5.19/780-usb-net-MeigLink_modem_support.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#define QUECTEL_VENDOR_ID 0x2c7c
2121
/* These Quectel products use Quectel's vendor ID */
22-
@@ -1140,6 +1142,11 @@ static const struct usb_device_id option
23-
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
22+
@@ -1143,6 +1145,11 @@ static const struct usb_device_id option
23+
.driver_info = ZLP },
2424
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
2525
.driver_info = RSVD(4) },
2626
+ /* Meiglink products using Qualcomm vendor ID */

target/linux/rockchip/patches-5.19/0001-arm64-dts-rockchip-add-Quartz64-A-fan-pinctrl.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
2424
#cooling-cells = <2>;
2525
};
2626

27-
@@ -524,6 +526,12 @@
27+
@@ -523,6 +525,12 @@
2828
};
2929
};
3030

target/linux/rockchip/patches-5.19/0002-arm64-dts-rockchip-enable-sdr-104-for-sdmmc-on-Quart.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
2222

2323
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
2424
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
25-
@@ -596,6 +596,7 @@
25+
@@ -595,6 +595,7 @@
2626
disable-wp;
2727
pinctrl-names = "default";
2828
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;

target/linux/rockchip/patches-5.19/0003-arm64-dts-rockchip-enable-sfc-controller-on-Quartz64.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
1616

1717
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
1818
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
19-
@@ -617,6 +617,22 @@
19+
@@ -616,6 +616,22 @@
2020
status = "okay";
2121
};
2222

target/linux/rockchip/patches-5.19/0005-arm64-dts-rockchip-Enable-PCIe-controller-on-quartz6.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
3535
vcc5v0_usb: vcc5v0_usb {
3636
compatible = "regulator-fixed";
3737
regulator-name = "vcc5v0_usb";
38-
@@ -203,6 +215,10 @@
38+
@@ -202,6 +214,10 @@
3939
status = "okay";
4040
};
4141

@@ -46,7 +46,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
4646
&cpu0 {
4747
cpu-supply = <&vdd_cpu>;
4848
};
49-
@@ -511,6 +527,14 @@
49+
@@ -510,6 +526,14 @@
5050
};
5151
};
5252

@@ -61,7 +61,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
6161
&pinctrl {
6262
bt {
6363
bt_enable_h: bt-enable-h {
64-
@@ -542,6 +566,16 @@
64+
@@ -541,6 +565,16 @@
6565
};
6666
};
6767

target/linux/rockchip/patches-5.19/0010-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-quartz.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
4343
leds {
4444
compatible = "gpio-leds";
4545

46-
@@ -280,6 +292,24 @@
46+
@@ -279,6 +291,24 @@
4747
status = "okay";
4848
};
4949

@@ -68,7 +68,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
6868
&i2c0 {
6969
status = "okay";
7070

71-
@@ -782,3 +812,20 @@
71+
@@ -781,3 +811,20 @@
7272
phy-supply = <&vcc5v0_usb20_host>;
7373
status = "okay";
7474
};

target/linux/rockchip/patches-5.19/0015-arm64-dts-rockchip-Enable-HDMI-audio-on-Quartz64-A.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
1616

1717
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
1818
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
19-
@@ -310,6 +310,10 @@
19+
@@ -309,6 +309,10 @@
2020
};
2121
};
2222

@@ -27,7 +27,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
2727
&i2c0 {
2828
status = "okay";
2929

30-
@@ -540,6 +544,10 @@
30+
@@ -539,6 +543,10 @@
3131
status = "okay";
3232
};
3333

0 commit comments

Comments
 (0)