From: Greg Kroah-Hartman Date: Mon, 25 Mar 2024 08:19:53 +0000 (+0100) Subject: patch refresh to apply cleanly without fuzz X-Git-Tag: v6.8.2~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c56e5409e465fc0e3091b220a3011c2ef3216de1;p=thirdparty%2Fkernel%2Fstable-queue.git patch refresh to apply cleanly without fuzz --- diff --git a/queue-6.6/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch b/queue-6.6/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch index 8997e14b2db..d9fb7e75cc8 100644 --- a/queue-6.6/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch +++ b/queue-6.6/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20231220-topic-sdm845_slpi_lcxmx-v1-1-db7c72ef99 Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 5f5c1b3bdeee8..166ad899905a7 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -3356,8 +3356,8 @@ slpi_pas: remoteproc@5c00000 { +@@ -3363,8 +3363,8 @@ qcom,qmp = <&aoss_qmp>; @@ -34,6 +32,3 @@ index 5f5c1b3bdeee8..166ad899905a7 100644 power-domain-names = "lcx", "lmx"; memory-region = <&slpi_mem>; --- -2.43.0 - diff --git a/queue-6.6/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch b/queue-6.6/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch index 6dde37e74f7..562bd7bff8c 100644 --- a/queue-6.6/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch +++ b/queue-6.6/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch @@ -23,14 +23,12 @@ Link: https://lore.kernel.org/r/20240221-dts-qcom-sm8550-fix-spmi-chnls-size-v2- Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index e0821039f43a1..eb4ac100a00de 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi -@@ -3020,7 +3020,7 @@ sram@c3f0000 { +@@ -3017,7 +3017,7 @@ spmi_bus: spmi@c400000 { compatible = "qcom,spmi-pmic-arb"; reg = <0 0x0c400000 0 0x3000>, @@ -39,6 +37,3 @@ index e0821039f43a1..eb4ac100a00de 100644 <0 0x0c440000 0 0x80000>, <0 0x0c4c0000 0 0x20000>, <0 0x0c42d000 0 0x4000>; --- -2.43.0 - diff --git a/queue-6.7/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch b/queue-6.7/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch index 4cae427e990..727fa40d6c6 100644 --- a/queue-6.7/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch +++ b/queue-6.7/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20231220-topic-sdm845_slpi_lcxmx-v1-1-db7c72ef99 Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 5fda325e4f45e..0a752fb190cdd 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -3346,8 +3346,8 @@ slpi_pas: remoteproc@5c00000 { +@@ -3353,8 +3353,8 @@ qcom,qmp = <&aoss_qmp>; @@ -34,6 +32,3 @@ index 5fda325e4f45e..0a752fb190cdd 100644 power-domain-names = "lcx", "lmx"; memory-region = <&slpi_mem>; --- -2.43.0 - diff --git a/queue-6.7/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch b/queue-6.7/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch index 804af25b1f3..0b09401c282 100644 --- a/queue-6.7/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch +++ b/queue-6.7/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch @@ -23,14 +23,12 @@ Link: https://lore.kernel.org/r/20240221-dts-qcom-sm8550-fix-spmi-chnls-size-v2- Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index f5d07af9c5cd5..13368664a80ca 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi -@@ -3050,7 +3050,7 @@ sram@c3f0000 { +@@ -3047,7 +3047,7 @@ spmi_bus: spmi@c400000 { compatible = "qcom,spmi-pmic-arb"; reg = <0 0x0c400000 0 0x3000>, @@ -39,6 +37,3 @@ index f5d07af9c5cd5..13368664a80ca 100644 <0 0x0c440000 0 0x80000>, <0 0x0c4c0000 0 0x20000>, <0 0x0c42d000 0 0x4000>; --- -2.43.0 - diff --git a/queue-6.8/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch b/queue-6.8/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch index 68df97e3593..a697bd68275 100644 --- a/queue-6.8/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch +++ b/queue-6.8/arm64-dts-qcom-sdm845-use-the-low-power-island-cx-mx.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20231220-topic-sdm845_slpi_lcxmx-v1-1-db7c72ef99 Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 5ee98ff84d171..29349d715b2cc 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -3368,8 +3368,8 @@ slpi_pas: remoteproc@5c00000 { +@@ -3366,8 +3366,8 @@ qcom,qmp = <&aoss_qmp>; @@ -34,6 +32,3 @@ index 5ee98ff84d171..29349d715b2cc 100644 power-domain-names = "lcx", "lmx"; memory-region = <&slpi_mem>; --- -2.43.0 - diff --git a/queue-6.8/arm64-dts-qcom-sm6115-drop-pipe-clock-selection.patch b/queue-6.8/arm64-dts-qcom-sm6115-drop-pipe-clock-selection.patch index b390ab45229..8a531d6b760 100644 --- a/queue-6.8/arm64-dts-qcom-sm6115-drop-pipe-clock-selection.patch +++ b/queue-6.8/arm64-dts-qcom-sm6115-drop-pipe-clock-selection.patch @@ -21,15 +21,13 @@ Link: https://lore.kernel.org/r/20240130-pmi632-typec-v3-5-b05fe44f0a51@linaro.o Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 4 ---- - arch/arm64/boot/dts/qcom/sm6115.dtsi | 1 - + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 4 ---- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 1 - 2 files changed, 5 deletions(-) -diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts -index 7c19f874fa716..52f31f3166c2f 100644 --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts -@@ -607,10 +607,6 @@ &usb { +@@ -607,10 +607,6 @@ status = "okay"; }; @@ -40,11 +38,9 @@ index 7c19f874fa716..52f31f3166c2f 100644 &usb_hsphy { vdd-supply = <&vreg_l4a_0p9>; vdda-pll-supply = <&vreg_l12a_1p8>; -diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi -index 4808982659eda..27b4a7836e247 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi -@@ -1614,7 +1614,6 @@ &bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>, +@@ -1610,7 +1610,6 @@ interconnect-names = "usb-ddr", "apps-usb"; @@ -52,6 +48,3 @@ index 4808982659eda..27b4a7836e247 100644 status = "disabled"; usb_dwc3: usb@4e00000 { --- -2.43.0 - diff --git a/queue-6.8/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch b/queue-6.8/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch index 5abb0728917..2dd79df6b43 100644 --- a/queue-6.8/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch +++ b/queue-6.8/arm64-dts-qcom-sm8550-fix-spmi-channels-size.patch @@ -23,14 +23,12 @@ Link: https://lore.kernel.org/r/20240221-dts-qcom-sm8550-fix-spmi-chnls-size-v2- Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index 72b1b8caafaa7..d3170b86ba1e8 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi -@@ -3251,7 +3251,7 @@ sram@c3f0000 { +@@ -3248,7 +3248,7 @@ spmi_bus: spmi@c400000 { compatible = "qcom,spmi-pmic-arb"; reg = <0 0x0c400000 0 0x3000>, @@ -39,6 +37,3 @@ index 72b1b8caafaa7..d3170b86ba1e8 100644 <0 0x0c440000 0 0x80000>, <0 0x0c4c0000 0 0x20000>, <0 0x0c42d000 0 0x4000>; --- -2.43.0 - diff --git a/queue-6.8/io_uring-net-correct-the-type-of-variable.patch b/queue-6.8/io_uring-net-correct-the-type-of-variable.patch index 6633add5c7c..3aef98afe97 100644 --- a/queue-6.8/io_uring-net-correct-the-type-of-variable.patch +++ b/queue-6.8/io_uring-net-correct-the-type-of-variable.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20240301144349.2807544-1-usama.anjum@collabora.c Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- - io_uring/net.c | 2 +- + io_uring/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/io_uring/net.c b/io_uring/net.c -index 058e04ea68c04..4aaeada03f1e7 100644 --- a/io_uring/net.c +++ b/io_uring/net.c -@@ -536,7 +536,7 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags) +@@ -536,7 +536,7 @@ int io_send(struct io_kiocb *req, unsign static int io_recvmsg_mshot_prep(struct io_kiocb *req, struct io_async_msghdr *iomsg, @@ -32,6 +30,3 @@ index 058e04ea68c04..4aaeada03f1e7 100644 { if ((req->flags & (REQ_F_APOLL_MULTISHOT|REQ_F_BUFFER_SELECT)) == (REQ_F_APOLL_MULTISHOT|REQ_F_BUFFER_SELECT)) { --- -2.43.0 -