From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 23 Jul 2022 15:08:17 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v5.10.133~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=971e17e3283790990ce638733a9da43237c88c81;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	revert-m68knommu-only-set-config_isa_dma_api-for-coldfire-sub-arch.patch
---

diff --git a/queue-5.10/revert-m68knommu-only-set-config_isa_dma_api-for-coldfire-sub-arch.patch b/queue-5.10/revert-m68knommu-only-set-config_isa_dma_api-for-coldfire-sub-arch.patch
new file mode 100644
index 00000000000..9cc003ef384
--- /dev/null
+++ b/queue-5.10/revert-m68knommu-only-set-config_isa_dma_api-for-coldfire-sub-arch.patch
@@ -0,0 +1,33 @@
+From 02ed6de36ce6c3e625afaad3284d66e7ec8b0b10 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 23 Jul 2022 17:06:06 +0200
+Subject: Revert "m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 87ae522e467e17a13b796e2cb595f9c3943e4d5e which is
+commit db87db65c1059f3be04506d122f8ec9b2fa3b05e upstream.
+
+It is not needed in 5.10.y and causes problems.
+
+Link: https://lore.kernel.org/r/CAK8P3a0vZrXxNp3YhrxFjFunHgxSZBKD9Y4darSODgeFAukCeQ@mail.gmail.com
+Reported-by: kernel test robot <lkp@intel.com>
+Reported-by: Arnd Bergmann <arnd@arndb.de>
+Cc: Greg Ungerer <gerg@linux-m68k.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/m68k/Kconfig.bus |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/m68k/Kconfig.bus
++++ b/arch/m68k/Kconfig.bus
+@@ -63,7 +63,7 @@ source "drivers/zorro/Kconfig"
+ 
+ endif
+ 
+-if COLDFIRE
++if !MMU
+ 
+ config ISA_DMA_API
+ 	def_bool !M5272
diff --git a/queue-5.10/series b/queue-5.10/series
index 2f7c45e97e8..e7bfbb22f8f 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -13,3 +13,4 @@ net-move-net_set_todo-inside-rollback_registered.patch
 net-inline-rollback_registered.patch
 net-move-rollback_registered_many.patch
 net-inline-rollback_registered_many.patch
+revert-m68knommu-only-set-config_isa_dma_api-for-coldfire-sub-arch.patch