diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
| commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
| tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch | |
| parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
| parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
| download | kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.gz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.xz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
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 040f33cb1..b9a47d091 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 c77c93c485a0..f808c4e0727f 100644 +index 16fbf74030fe..746d8f9da456 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1543,9 +1543,9 @@ config HIGHMEM +@@ -1550,9 +1550,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE |