Drop dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch b/queue-4.19/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
deleted file mode 100644 (file)
index 920adff..0000000
--- a/queue-4.19/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9b3bc541d641330272fd281a894cdac335ca2485 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Jan 2021 15:20:45 +0100
-Subject: dmaengine: stm32-mdma: fix STM32_MDMA_VERY_HIGH_PRIORITY value
-
-From: Amelie Delaunay <amelie.delaunay@foss.st.com>
-
-[ Upstream commit e1263f9277bad198c2acc8092a41aea1edbea0e4 ]
-
-STM32_MDMA_VERY_HIGH_PRIORITY is b11 not 0x11, so fix it with 0x3.
-
-Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
-Link: https://lore.kernel.org/r/20210104142045.25583-1-amelie.delaunay@foss.st.com
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/dma/stm32-mdma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c
-index 9c6867916e890..0681c0fa44cfb 100644
---- a/drivers/dma/stm32-mdma.c
-+++ b/drivers/dma/stm32-mdma.c
-@@ -209,7 +209,7 @@
- #define STM32_MDMA_MAX_CHANNELS               63
- #define STM32_MDMA_MAX_REQUESTS               256
- #define STM32_MDMA_MAX_BURST          128
--#define STM32_MDMA_VERY_HIGH_PRIORITY 0x11
-+#define STM32_MDMA_VERY_HIGH_PRIORITY 0x3
- 
- enum stm32_mdma_trigger_mode {
-       STM32_MDMA_BUFFER,
--- 
-2.27.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index efd265bc170bcf458cccff35e57a9c1e4b871311..96fa90d265d4556ea2571b65f3c9304218503340 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -15,7 +15,6 @@ arc-build-add-uimage.lzma-to-the-top-level-target.patch
 arc-build-add-boot_targets-to-phony.patch
 btrfs-fix-transaction-leak-and-crash-after-ro-remoun.patch
 ethernet-ucc_geth-fix-definition-and-size-of-ucc_get.patch
-dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
 bfq-fix-computation-of-shallow-depth.patch
 arch-arc-add-copy_user_page-to-asm-page.h-to-fix-bui.patch
 misdn-dsp-select-config_bitreverse.patch

diff --git a/queue-5.10/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch b/queue-5.10/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
deleted file mode 100644 (file)
index c0a230d..0000000
--- a/queue-5.10/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a06fd00fab4cbadb63ca7111cc250aba03c093cc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Jan 2021 15:20:45 +0100
-Subject: dmaengine: stm32-mdma: fix STM32_MDMA_VERY_HIGH_PRIORITY value
-
-From: Amelie Delaunay <amelie.delaunay@foss.st.com>
-
-[ Upstream commit e1263f9277bad198c2acc8092a41aea1edbea0e4 ]
-
-STM32_MDMA_VERY_HIGH_PRIORITY is b11 not 0x11, so fix it with 0x3.
-
-Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
-Link: https://lore.kernel.org/r/20210104142045.25583-1-amelie.delaunay@foss.st.com
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/dma/stm32-mdma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c
-index 08cfbfab837bb..ca97cbe433651 100644
---- a/drivers/dma/stm32-mdma.c
-+++ b/drivers/dma/stm32-mdma.c
-@@ -199,7 +199,7 @@
- #define STM32_MDMA_MAX_CHANNELS               63
- #define STM32_MDMA_MAX_REQUESTS               256
- #define STM32_MDMA_MAX_BURST          128
--#define STM32_MDMA_VERY_HIGH_PRIORITY 0x11
-+#define STM32_MDMA_VERY_HIGH_PRIORITY 0x3
- 
- enum stm32_mdma_trigger_mode {
-       STM32_MDMA_BUFFER,
--- 
-2.27.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 18fc941ff10d5532dd8d8231971db24bf6609456..55c431973bafad0c32820bfc4ca04287c863ec52 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -76,7 +76,6 @@ hwmon-pwm-fan-ensure-that-calculation-doesn-t-discar.patch
 lib-raid6-let-unroll-rules-work-with-macos-userland.patch
 kconfig-remove-kvmconfig-and-xenconfig-shorthands.patch
 spi-fix-the-divide-by-0-error-when-calculating-xfer-.patch
-dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
 io_uring-drop-file-refs-after-task-cancel.patch
 bfq-fix-computation-of-shallow-depth.patch
 arch-arc-add-copy_user_page-to-asm-page.h-to-fix-bui.patch

diff --git a/queue-5.4/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch b/queue-5.4/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
deleted file mode 100644 (file)
index 6c4ec23..0000000
--- a/queue-5.4/dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d43c67a57b708f5ebfec91970330169468443209 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Jan 2021 15:20:45 +0100
-Subject: dmaengine: stm32-mdma: fix STM32_MDMA_VERY_HIGH_PRIORITY value
-
-From: Amelie Delaunay <amelie.delaunay@foss.st.com>
-
-[ Upstream commit e1263f9277bad198c2acc8092a41aea1edbea0e4 ]
-
-STM32_MDMA_VERY_HIGH_PRIORITY is b11 not 0x11, so fix it with 0x3.
-
-Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
-Link: https://lore.kernel.org/r/20210104142045.25583-1-amelie.delaunay@foss.st.com
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/dma/stm32-mdma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c
-index ee1cbf3be75d5..718f0779ac598 100644
---- a/drivers/dma/stm32-mdma.c
-+++ b/drivers/dma/stm32-mdma.c
-@@ -199,7 +199,7 @@
- #define STM32_MDMA_MAX_CHANNELS               63
- #define STM32_MDMA_MAX_REQUESTS               256
- #define STM32_MDMA_MAX_BURST          128
--#define STM32_MDMA_VERY_HIGH_PRIORITY 0x11
-+#define STM32_MDMA_VERY_HIGH_PRIORITY 0x3
- 
- enum stm32_mdma_trigger_mode {
-       STM32_MDMA_BUFFER,
--- 
-2.27.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index f898794befcf194cb27f1e7befd2b15b4314b1c3..f895ce7145c15d80c3662cf6777b0b2bd2c498c4 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -34,7 +34,6 @@ habanalabs-register-to-pci-shutdown-callback.patch
 habanalabs-fix-memleak-in-hl_device_reset.patch
 hwmon-pwm-fan-ensure-that-calculation-doesn-t-discar.patch
 lib-raid6-let-unroll-rules-work-with-macos-userland.patch
-dmaengine-stm32-mdma-fix-stm32_mdma_very_high_priori.patch
 bfq-fix-computation-of-shallow-depth.patch
 arch-arc-add-copy_user_page-to-asm-page.h-to-fix-bui.patch
 misdn-dsp-select-config_bitreverse.patch