diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
commit | aae208c12f61545f388c2e6d1f22c30ec858c293 (patch) | |
tree | 7a6f6fa03b1360b9df7f2150bd337fa33a9ff8d5 /0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch | |
parent | 81b1269020cd33317e9c61de223f735c3ef35525 (diff) | |
parent | 8bcec8d9026ed6b2c51c7947c2e28628e701dfe8 (diff) | |
download | kernel-5.7.0-0.rc6.1.vanilla.1.fc33.tar.gz kernel-5.7.0-0.rc6.1.vanilla.1.fc33.tar.xz kernel-5.7.0-0.rc6.1.vanilla.1.fc33.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.1.vanilla.1.fc33kernel-5.7.0-0.rc6.1.vanilla.1.fc32kernel-5.7.0-0.rc6.1.vanilla.1.fc31kernel-5.7.0-0.rc6.1.vanilla.1.fc30
Diffstat (limited to '0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch')
-rw-r--r-- | 0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch index cd03a7a04..040f33cb1 100644 --- a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch +++ b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch @@ -11,10 +11,10 @@ Signed-off-by: Jon Masters <jcm@redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 66a04f6f4775..7b63103f088c 100644 +index c77c93c485a0..f808c4e0727f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1542,9 +1542,9 @@ config HIGHMEM +@@ -1543,9 +1543,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE |