drop dma patch from all branches

diff --git a/queue-5.10/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch b/queue-5.10/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
deleted file mode 100644 (file)
index f340d7a..0000000
--- a/queue-5.10/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2e9e270d7119dc7c72b1230875ea2e52ef67ad17 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Oct 2025 14:05:27 +0000
-Subject: dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
-
-From: James Clark <james.clark@linaro.org>
-
-[ Upstream commit a50f7456f853ec3a6f07cbe1d16ad8a8b2501320 ]
-
-Clang doesn't like that (1ULL<<(64)) overflows when initializing a
-global scope variable, even if that part of the ternary isn't used when
-n = 64. The same initialization can be done without warnings in function
-scopes, and GCC doesn't mind either way.
-
-The build failure that highlighted this was already fixed in a different
-way [1], which also has detailed links to the Clang issues. However it's
-not going to be long before the same thing happens again, so it's better
-to fix the root cause.
-
-Fix it by using GENMASK_ULL() which does exactly the same thing, is much
-more readable anyway, and doesn't have a shift that overflows.
-
-[1]: https://lore.kernel.org/all/20250918-mmp-pdma-simplify-dma-addressing-v1-1-5c2be2b85696@riscstar.com/
-
-Signed-off-by: James Clark <james.clark@linaro.org>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Link: https://lore.kernel.org/r/20251030-james-fix-dma_bit_mask-v1-1-ad1ce7cfab6e@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/dma-mapping.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index fb48f8ba5dcc8..c4fda94321bb4 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -73,7 +73,7 @@
-  */
- #define DMA_MAPPING_ERROR             (~(dma_addr_t)0)
- 
--#define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-+#define DMA_BIT_MASK(n)       GENMASK_ULL(n - 1, 0)
- 
- #ifdef CONFIG_DMA_API_DEBUG
- void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
--- 
-2.51.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 6513653cb345441eae1314963cf2d621f3c48c69..25ad591685ca2d826c869f6fd2462c6fc8f58167 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -16,7 +16,6 @@ usb-serial-belkin_sa-fix-tiocmbis-and-tiocmbic.patch
 usb-serial-kobil_sct-fix-tiocmbis-and-tiocmbic.patch
 spi-xilinx-increase-number-of-retries-before-declari.patch
 spi-imx-keep-dma-request-disabled-before-dma-transfe.patch
-dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
 bfs-reconstruct-file-type-when-loading-from-disk.patch
 pinctrl-qcom-msm-fix-deadlock-in-pinmux-configuratio.patch
 platform-x86-acer-wmi-ignore-backlight-event.patch

diff --git a/queue-5.15/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch b/queue-5.15/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
deleted file mode 100644 (file)
index 276b21d..0000000
--- a/queue-5.15/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b61323372b217568965e6652aadc996b7e5830eb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Oct 2025 14:05:27 +0000
-Subject: dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
-
-From: James Clark <james.clark@linaro.org>
-
-[ Upstream commit a50f7456f853ec3a6f07cbe1d16ad8a8b2501320 ]
-
-Clang doesn't like that (1ULL<<(64)) overflows when initializing a
-global scope variable, even if that part of the ternary isn't used when
-n = 64. The same initialization can be done without warnings in function
-scopes, and GCC doesn't mind either way.
-
-The build failure that highlighted this was already fixed in a different
-way [1], which also has detailed links to the Clang issues. However it's
-not going to be long before the same thing happens again, so it's better
-to fix the root cause.
-
-Fix it by using GENMASK_ULL() which does exactly the same thing, is much
-more readable anyway, and doesn't have a shift that overflows.
-
-[1]: https://lore.kernel.org/all/20250918-mmp-pdma-simplify-dma-addressing-v1-1-5c2be2b85696@riscstar.com/
-
-Signed-off-by: James Clark <james.clark@linaro.org>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Link: https://lore.kernel.org/r/20251030-james-fix-dma_bit_mask-v1-1-ad1ce7cfab6e@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/dma-mapping.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index d7b91f82b0dce..e034355c35dd5 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -73,7 +73,7 @@
-  */
- #define DMA_MAPPING_ERROR             (~(dma_addr_t)0)
- 
--#define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-+#define DMA_BIT_MASK(n)       GENMASK_ULL(n - 1, 0)
- 
- #ifdef CONFIG_DMA_API_DEBUG
- void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
--- 
-2.51.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index c78a04f9d8ea0b002378159c96c7331cd1111dab..c2c3a660def9a9303cba4925af8b8c1f93b061a1 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -21,7 +21,6 @@ usb-serial-belkin_sa-fix-tiocmbis-and-tiocmbic.patch
 usb-serial-kobil_sct-fix-tiocmbis-and-tiocmbic.patch
 spi-xilinx-increase-number-of-retries-before-declari.patch
 spi-imx-keep-dma-request-disabled-before-dma-transfe.patch
-dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
 bfs-reconstruct-file-type-when-loading-from-disk.patch
 pinctrl-qcom-msm-fix-deadlock-in-pinmux-configuratio.patch
 platform-x86-acer-wmi-ignore-backlight-event.patch

diff --git a/queue-6.1/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch b/queue-6.1/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
deleted file mode 100644 (file)
index e59b5f1..0000000
--- a/queue-6.1/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cdd6f27e6aba505ab8a797168701d7471022b67e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Oct 2025 14:05:27 +0000
-Subject: dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
-
-From: James Clark <james.clark@linaro.org>
-
-[ Upstream commit a50f7456f853ec3a6f07cbe1d16ad8a8b2501320 ]
-
-Clang doesn't like that (1ULL<<(64)) overflows when initializing a
-global scope variable, even if that part of the ternary isn't used when
-n = 64. The same initialization can be done without warnings in function
-scopes, and GCC doesn't mind either way.
-
-The build failure that highlighted this was already fixed in a different
-way [1], which also has detailed links to the Clang issues. However it's
-not going to be long before the same thing happens again, so it's better
-to fix the root cause.
-
-Fix it by using GENMASK_ULL() which does exactly the same thing, is much
-more readable anyway, and doesn't have a shift that overflows.
-
-[1]: https://lore.kernel.org/all/20250918-mmp-pdma-simplify-dma-addressing-v1-1-5c2be2b85696@riscstar.com/
-
-Signed-off-by: James Clark <james.clark@linaro.org>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Link: https://lore.kernel.org/r/20251030-james-fix-dma_bit_mask-v1-1-ad1ce7cfab6e@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/dma-mapping.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index af3f39ecc1b87..ab400d957754c 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -74,7 +74,7 @@
-  */
- #define DMA_MAPPING_ERROR             (~(dma_addr_t)0)
- 
--#define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-+#define DMA_BIT_MASK(n)       GENMASK_ULL(n - 1, 0)
- 
- #ifdef CONFIG_DMA_API_DEBUG
- void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
--- 
-2.51.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 7a0945aa67deedb9d74ce1874271c71552bc116c..e6fbc3bafd8b60ef0ee57baedbaea394390a5dd5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -21,7 +21,6 @@ usb-serial-kobil_sct-fix-tiocmbis-and-tiocmbic.patch
 ftrace-bpf-fix-ipmodify-direct-in-modify_ftrace_dire.patch
 spi-xilinx-increase-number-of-retries-before-declari.patch
 spi-imx-keep-dma-request-disabled-before-dma-transfe.patch
-dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
 drm-vmwgfx-use-kref-in-vmw_bo_dirty.patch
 smb-fix-invalid-username-check-in-smb3_fs_context_pa.patch
 alsa-usb-audio-add-native-dsd-quirks-for-pureaudio-d.patch

diff --git a/queue-6.12/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch b/queue-6.12/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
deleted file mode 100644 (file)
index 3905505..0000000
--- a/queue-6.12/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9aeb742f7c35afc0e97bc1ede3ce1523f745ff99 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Oct 2025 14:05:27 +0000
-Subject: dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
-
-From: James Clark <james.clark@linaro.org>
-
-[ Upstream commit a50f7456f853ec3a6f07cbe1d16ad8a8b2501320 ]
-
-Clang doesn't like that (1ULL<<(64)) overflows when initializing a
-global scope variable, even if that part of the ternary isn't used when
-n = 64. The same initialization can be done without warnings in function
-scopes, and GCC doesn't mind either way.
-
-The build failure that highlighted this was already fixed in a different
-way [1], which also has detailed links to the Clang issues. However it's
-not going to be long before the same thing happens again, so it's better
-to fix the root cause.
-
-Fix it by using GENMASK_ULL() which does exactly the same thing, is much
-more readable anyway, and doesn't have a shift that overflows.
-
-[1]: https://lore.kernel.org/all/20250918-mmp-pdma-simplify-dma-addressing-v1-1-5c2be2b85696@riscstar.com/
-
-Signed-off-by: James Clark <james.clark@linaro.org>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Link: https://lore.kernel.org/r/20251030-james-fix-dma_bit_mask-v1-1-ad1ce7cfab6e@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/dma-mapping.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 22b9099927fad..803f64e169c59 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -74,7 +74,7 @@
-  */
- #define DMA_MAPPING_ERROR             (~(dma_addr_t)0)
- 
--#define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-+#define DMA_BIT_MASK(n)       GENMASK_ULL(n - 1, 0)
- 
- #ifdef CONFIG_DMA_API_DEBUG
- void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
--- 
-2.51.0
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 94ccc29100ded5927439a3bc5b761a140f1f1092..5856d06a2510a4510133ff95ed0eceae575bc4d5 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -20,7 +20,6 @@ usb-serial-kobil_sct-fix-tiocmbis-and-tiocmbic.patch
 ftrace-bpf-fix-ipmodify-direct-in-modify_ftrace_dire.patch
 spi-xilinx-increase-number-of-retries-before-declari.patch
 spi-imx-keep-dma-request-disabled-before-dma-transfe.patch
-dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
 drm-vmwgfx-use-kref-in-vmw_bo_dirty.patch
 bluetooth-btrtl-avoid-loading-the-config-file-on-sec.patch
 smb-fix-invalid-username-check-in-smb3_fs_context_pa.patch

diff --git a/queue-6.17/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch b/queue-6.17/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
deleted file mode 100644 (file)
index 83b048b..0000000
--- a/queue-6.17/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 51a1912d46ceb70602de50c167e440966b9836f1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Oct 2025 14:05:27 +0000
-Subject: dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
-
-From: James Clark <james.clark@linaro.org>
-
-[ Upstream commit a50f7456f853ec3a6f07cbe1d16ad8a8b2501320 ]
-
-Clang doesn't like that (1ULL<<(64)) overflows when initializing a
-global scope variable, even if that part of the ternary isn't used when
-n = 64. The same initialization can be done without warnings in function
-scopes, and GCC doesn't mind either way.
-
-The build failure that highlighted this was already fixed in a different
-way [1], which also has detailed links to the Clang issues. However it's
-not going to be long before the same thing happens again, so it's better
-to fix the root cause.
-
-Fix it by using GENMASK_ULL() which does exactly the same thing, is much
-more readable anyway, and doesn't have a shift that overflows.
-
-[1]: https://lore.kernel.org/all/20250918-mmp-pdma-simplify-dma-addressing-v1-1-5c2be2b85696@riscstar.com/
-
-Signed-off-by: James Clark <james.clark@linaro.org>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Link: https://lore.kernel.org/r/20251030-james-fix-dma_bit_mask-v1-1-ad1ce7cfab6e@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/dma-mapping.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 55c03e5fe8cb3..277daf71ec8c7 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -70,7 +70,7 @@
-  */
- #define DMA_MAPPING_ERROR             (~(dma_addr_t)0)
- 
--#define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-+#define DMA_BIT_MASK(n)       GENMASK_ULL(n - 1, 0)
- 
- struct dma_iova_state {
-       dma_addr_t addr;
--- 
-2.51.0
-

diff --git a/queue-6.17/series b/queue-6.17/series
index e636111f76c3a25a276bcfe601b2a7d996a27d7c..cc81fc9ed9e23ba258d403838ea6371fb077463a 100644 (file)
--- a/queue-6.17/series
+++ b/queue-6.17/series
@@ -19,7 +19,6 @@ usb-serial-kobil_sct-fix-tiocmbis-and-tiocmbic.patch
 ftrace-bpf-fix-ipmodify-direct-in-modify_ftrace_dire.patch
 spi-xilinx-increase-number-of-retries-before-declari.patch
 spi-imx-keep-dma-request-disabled-before-dma-transfe.patch
-dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
 acpi-mrrm-fix-memory-leaks-and-improve-error-handlin.patch
 drm-vmwgfx-use-kref-in-vmw_bo_dirty.patch
 arm64-reject-modules-with-internal-alternative-callb.patch

diff --git a/queue-6.6/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch b/queue-6.6/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
deleted file mode 100644 (file)
index 195076a..0000000
--- a/queue-6.6/dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a661ee914b7b7a135d43fa60f04b705eca07c4b1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Oct 2025 14:05:27 +0000
-Subject: dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
-
-From: James Clark <james.clark@linaro.org>
-
-[ Upstream commit a50f7456f853ec3a6f07cbe1d16ad8a8b2501320 ]
-
-Clang doesn't like that (1ULL<<(64)) overflows when initializing a
-global scope variable, even if that part of the ternary isn't used when
-n = 64. The same initialization can be done without warnings in function
-scopes, and GCC doesn't mind either way.
-
-The build failure that highlighted this was already fixed in a different
-way [1], which also has detailed links to the Clang issues. However it's
-not going to be long before the same thing happens again, so it's better
-to fix the root cause.
-
-Fix it by using GENMASK_ULL() which does exactly the same thing, is much
-more readable anyway, and doesn't have a shift that overflows.
-
-[1]: https://lore.kernel.org/all/20250918-mmp-pdma-simplify-dma-addressing-v1-1-5c2be2b85696@riscstar.com/
-
-Signed-off-by: James Clark <james.clark@linaro.org>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Link: https://lore.kernel.org/r/20251030-james-fix-dma_bit_mask-v1-1-ad1ce7cfab6e@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/dma-mapping.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 608e8296ba206..48656f6344b65 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -74,7 +74,7 @@
-  */
- #define DMA_MAPPING_ERROR             (~(dma_addr_t)0)
- 
--#define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-+#define DMA_BIT_MASK(n)       GENMASK_ULL(n - 1, 0)
- 
- #ifdef CONFIG_DMA_API_DEBUG
- void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
--- 
-2.51.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 411fa2fea7769f78c95662663355e01c0046ff98..d2fd2ae3d7e5cd0f9ad11e11e58dcffea9c0dfa8 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -21,7 +21,6 @@ usb-serial-kobil_sct-fix-tiocmbis-and-tiocmbic.patch
 ftrace-bpf-fix-ipmodify-direct-in-modify_ftrace_dire.patch
 spi-xilinx-increase-number-of-retries-before-declari.patch
 spi-imx-keep-dma-request-disabled-before-dma-transfe.patch
-dma-mapping-allow-use-of-dma_bit_mask-64-in-global-s.patch
 drm-vmwgfx-use-kref-in-vmw_bo_dirty.patch
 bluetooth-btrtl-avoid-loading-the-config-file-on-sec.patch
 smb-fix-invalid-username-check-in-smb3_fs_context_pa.patch