summaryrefslogtreecommitdiffstats
path: root/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
commitd0b8941357b7ce0c26d19376bc4d827042d6bb12 (patch)
tree61138493dd96ee303830bc148d607fb915562b77 /0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
parentf7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff)
parentdadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff)
downloadkernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.gz
kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.xz
kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.1.vanilla.1.fc33kernel-5.8.0-0.rc1.1.vanilla.1.fc32kernel-5.8.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to '0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch')
-rw-r--r--0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
index 33a7efb26..d086cecf2 100644
--- a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
+++ b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index cb73d398a2fe..2c2b7760c13c 100644
+index e60f9c74f41d..faa1105e528d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1133,6 +1133,7 @@ config XEN