drop lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch from...

diff --git a/queue-4.14/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch b/queue-4.14/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
deleted file mode 100644 (file)
index a1e389f..0000000
--- a/queue-4.14/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Wed, 19 Jan 2022 18:10:28 -0800
-Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
-
-Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
-256K") disabled btrfs for configurations that used a 256kB page size.
-However, it did not fully solve the problem because CONFIG_TEST_KMOD
-selects CONFIG_BTRFS, which does not account for the dependency.  This
-results in a Kconfig warning and the failed BUILD_BUG_ON error
-returning.
-
-  WARNING: unmet direct dependencies detected for BTRFS_FS
-    Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
-    Selected by [m]:
-    - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
-
-To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
-CONFIG_TEST_KMOD so there is no more invalid configuration or build
-errors.
-
-Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
-Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Chris Mason <clm@fb.com>
-Cc: David Sterba <dsterba@suse.com>
-Cc: Josef Bacik <josef@toxicpanda.com>
-Cc: Luis Chamberlain <mcgrof@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/Kconfig.debug |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -1884,6 +1884,7 @@ config TEST_KMOD
-       depends on BLOCK && (64BIT || LBDAF)      # for XFS, BTRFS
-       depends on NETDEVICES && NET_CORE && INET # for TUN
-       depends on BLOCK
-+      depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
-       select TEST_LKM
-       select XFS_FS
-       select TUN

diff --git a/queue-4.14/series b/queue-4.14/series
index afea2f930235c79fd432089781df4f2d23858abc..44a47179d34cfad974c72811df1dfa31a8616778 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -157,7 +157,6 @@ ext4-don-t-use-the-orphan-list-when-migrating-an-inode.patch
 crypto-stm32-crc32-fix-kernel-bug-triggered-in-probe.patch
 drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch
 firmware-update-kconfig-help-text-for-google-firmware.patch
-lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
 documentation-refer-to-config-randomize_base-for-kernel-address-space-randomization.patch
 rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
 rdma-rxe-fix-a-typo-in-opcode-name.patch

diff --git a/queue-4.19/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch b/queue-4.19/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
deleted file mode 100644 (file)
index 37fb9d6..0000000
--- a/queue-4.19/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Wed, 19 Jan 2022 18:10:28 -0800
-Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
-
-Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
-256K") disabled btrfs for configurations that used a 256kB page size.
-However, it did not fully solve the problem because CONFIG_TEST_KMOD
-selects CONFIG_BTRFS, which does not account for the dependency.  This
-results in a Kconfig warning and the failed BUILD_BUG_ON error
-returning.
-
-  WARNING: unmet direct dependencies detected for BTRFS_FS
-    Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
-    Selected by [m]:
-    - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
-
-To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
-CONFIG_TEST_KMOD so there is no more invalid configuration or build
-errors.
-
-Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
-Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Chris Mason <clm@fb.com>
-Cc: David Sterba <dsterba@suse.com>
-Cc: Josef Bacik <josef@toxicpanda.com>
-Cc: Luis Chamberlain <mcgrof@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/Kconfig.debug |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -1934,6 +1934,7 @@ config TEST_KMOD
-       depends on BLOCK && (64BIT || LBDAF)      # for XFS, BTRFS
-       depends on NETDEVICES && NET_CORE && INET # for TUN
-       depends on BLOCK
-+      depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
-       select TEST_LKM
-       select XFS_FS
-       select TUN

diff --git a/queue-4.19/series b/queue-4.19/series
index 357bf7009cf61a2e6271d2c43402590a3c6b679b..d29d5879966c1f41e1050f372f455a9c89a5df11 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -211,7 +211,6 @@ drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch
 arm-dts-fix-vcsi-regulator-to-be-always-on-for-droid4-to-prevent-hangs.patch
 firmware-update-kconfig-help-text-for-google-firmware.patch
 media-rcar-csi2-optimize-the-selection-phtw-register.patch
-lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
 documentation-refer-to-config-randomize_base-for-kernel-address-space-randomization.patch
 rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
 rdma-rxe-fix-a-typo-in-opcode-name.patch

diff --git a/queue-5.10/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch b/queue-5.10/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
deleted file mode 100644 (file)
index 9ec71b5..0000000
--- a/queue-5.10/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Wed, 19 Jan 2022 18:10:28 -0800
-Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
-
-Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
-256K") disabled btrfs for configurations that used a 256kB page size.
-However, it did not fully solve the problem because CONFIG_TEST_KMOD
-selects CONFIG_BTRFS, which does not account for the dependency.  This
-results in a Kconfig warning and the failed BUILD_BUG_ON error
-returning.
-
-  WARNING: unmet direct dependencies detected for BTRFS_FS
-    Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
-    Selected by [m]:
-    - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
-
-To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
-CONFIG_TEST_KMOD so there is no more invalid configuration or build
-errors.
-
-Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
-Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Chris Mason <clm@fb.com>
-Cc: David Sterba <dsterba@suse.com>
-Cc: Josef Bacik <josef@toxicpanda.com>
-Cc: Luis Chamberlain <mcgrof@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/Kconfig.debug |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -2300,6 +2300,7 @@ config TEST_KMOD
-       depends on m
-       depends on NETDEVICES && NET_CORE && INET # for TUN
-       depends on BLOCK
-+      depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
-       select TEST_LKM
-       select XFS_FS
-       select TUN

diff --git a/queue-5.10/series b/queue-5.10/series
index 45bb08e558f85efa13e2a40e4bd7192f54471864..ae770c3616650d90deb2695a291a00b9e6a48182 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -487,7 +487,6 @@ firmware-update-kconfig-help-text-for-google-firmware.patch
 can-mcp251xfd-mcp251xfd_tef_obj_read-fix-typo-in-error-message.patch
 media-rcar-csi2-optimize-the-selection-phtw-register.patch
 drm-vc4-hdmi-make-sure-the-device-is-powered-with-cec.patch
-lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
 media-correct-media_test_support-help-text.patch
 documentation-dmaengine-correctly-describe-dmatest-with-channel-unset.patch
 documentation-acpi-fix-data-node-reference-documentation.patch

diff --git a/queue-5.15/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch b/queue-5.15/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
deleted file mode 100644 (file)
index 7531cab..0000000
--- a/queue-5.15/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Wed, 19 Jan 2022 18:10:28 -0800
-Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
-
-Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
-256K") disabled btrfs for configurations that used a 256kB page size.
-However, it did not fully solve the problem because CONFIG_TEST_KMOD
-selects CONFIG_BTRFS, which does not account for the dependency.  This
-results in a Kconfig warning and the failed BUILD_BUG_ON error
-returning.
-
-  WARNING: unmet direct dependencies detected for BTRFS_FS
-    Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
-    Selected by [m]:
-    - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
-
-To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
-CONFIG_TEST_KMOD so there is no more invalid configuration or build
-errors.
-
-Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
-Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Chris Mason <clm@fb.com>
-Cc: David Sterba <dsterba@suse.com>
-Cc: Josef Bacik <josef@toxicpanda.com>
-Cc: Luis Chamberlain <mcgrof@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/Kconfig.debug |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -2473,6 +2473,7 @@ config TEST_KMOD
-       depends on m
-       depends on NETDEVICES && NET_CORE && INET # for TUN
-       depends on BLOCK
-+      depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
-       select TEST_LKM
-       select XFS_FS
-       select TUN

diff --git a/queue-5.15/series b/queue-5.15/series
index 141b625a95efda92f6552a4b58e1d9b26f8c3474..9c310516144cab496ba2121d7ffd3cbd3d3ffa8f 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -732,7 +732,6 @@ firmware-update-kconfig-help-text-for-google-firmware.patch
 can-mcp251xfd-mcp251xfd_tef_obj_read-fix-typo-in-error-message.patch
 media-rcar-csi2-optimize-the-selection-phtw-register.patch
 drm-vc4-hdmi-make-sure-the-device-is-powered-with-cec.patch
-lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
 media-correct-media_test_support-help-text.patch
 documentation-coresight-fix-documentation-issue.patch
 documentation-dmaengine-correctly-describe-dmatest-with-channel-unset.patch

diff --git a/queue-5.16/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch b/queue-5.16/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
deleted file mode 100644 (file)
index 331440b..0000000
--- a/queue-5.16/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Wed, 19 Jan 2022 18:10:28 -0800
-Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
-
-Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
-256K") disabled btrfs for configurations that used a 256kB page size.
-However, it did not fully solve the problem because CONFIG_TEST_KMOD
-selects CONFIG_BTRFS, which does not account for the dependency.  This
-results in a Kconfig warning and the failed BUILD_BUG_ON error
-returning.
-
-  WARNING: unmet direct dependencies detected for BTRFS_FS
-    Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
-    Selected by [m]:
-    - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
-
-To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
-CONFIG_TEST_KMOD so there is no more invalid configuration or build
-errors.
-
-Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
-Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Chris Mason <clm@fb.com>
-Cc: David Sterba <dsterba@suse.com>
-Cc: Josef Bacik <josef@toxicpanda.com>
-Cc: Luis Chamberlain <mcgrof@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/Kconfig.debug |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -2487,6 +2487,7 @@ config TEST_KMOD
-       depends on m
-       depends on NETDEVICES && NET_CORE && INET # for TUN
-       depends on BLOCK
-+      depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
-       select TEST_LKM
-       select XFS_FS
-       select TUN

diff --git a/queue-5.16/series b/queue-5.16/series
index e76fae2ae23c4938473d5d9957e88c32ad9f65ae..bde10b823789f14405b60b218fe1d7c8d9285dfb 100644 (file)
--- a/queue-5.16/series
+++ b/queue-5.16/series
@@ -906,7 +906,6 @@ firmware-update-kconfig-help-text-for-google-firmware.patch
 can-mcp251xfd-mcp251xfd_tef_obj_read-fix-typo-in-error-message.patch
 media-rcar-csi2-optimize-the-selection-phtw-register.patch
 drm-vc4-hdmi-make-sure-the-device-is-powered-with-cec.patch
-lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
 media-correct-media_test_support-help-text.patch
 documentation-coresight-fix-documentation-issue.patch
 documentation-dmaengine-correctly-describe-dmatest-with-channel-unset.patch

diff --git a/queue-5.4/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch b/queue-5.4/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
deleted file mode 100644 (file)
index 6d98762..0000000
--- a/queue-5.4/lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Wed, 19 Jan 2022 18:10:28 -0800
-Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
-
-Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
-256K") disabled btrfs for configurations that used a 256kB page size.
-However, it did not fully solve the problem because CONFIG_TEST_KMOD
-selects CONFIG_BTRFS, which does not account for the dependency.  This
-results in a Kconfig warning and the failed BUILD_BUG_ON error
-returning.
-
-  WARNING: unmet direct dependencies detected for BTRFS_FS
-    Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
-    Selected by [m]:
-    - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
-
-To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
-CONFIG_TEST_KMOD so there is no more invalid configuration or build
-errors.
-
-Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
-Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Chris Mason <clm@fb.com>
-Cc: David Sterba <dsterba@suse.com>
-Cc: Josef Bacik <josef@toxicpanda.com>
-Cc: Luis Chamberlain <mcgrof@kernel.org>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/Kconfig.debug |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -1970,6 +1970,7 @@ config TEST_KMOD
-       depends on m
-       depends on NETDEVICES && NET_CORE && INET # for TUN
-       depends on BLOCK
-+      depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
-       select TEST_LKM
-       select XFS_FS
-       select TUN

diff --git a/queue-5.4/series b/queue-5.4/series
index 57617470447c1b6d94b3c2d6251bfdef6ed82faa..c599b27fceb15236525554f09cb42da946852496 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -274,7 +274,6 @@ drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch
 of-base-improve-argument-length-mismatch-error.patch
 firmware-update-kconfig-help-text-for-google-firmware.patch
 media-rcar-csi2-optimize-the-selection-phtw-register.patch
-lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
 documentation-dmaengine-correctly-describe-dmatest-with-channel-unset.patch
 documentation-acpi-fix-data-node-reference-documentation.patch
 documentation-refer-to-config-randomize_base-for-kernel-address-space-randomization.patch