diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
| commit | f4c3c7a8ab9226af448d66103dfddf387711af9d (patch) | |
| tree | fe668c86a171420067eefe2b30ab4ca764ebd4c8 /0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch | |
| parent | d2c10672fc73b0484b5bd441c7a43087a20cfc61 (diff) | |
| parent | 4459220aecb835a73131f0de65f5d9b4200a8efc (diff) | |
| download | kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.gz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.xz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc31
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 | 2 |
1 files changed, 1 insertions, 1 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 b9a47d091..ce34b630e 100644 --- a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch +++ b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch @@ -11,7 +11,7 @@ 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 16fbf74030fe..746d8f9da456 100644 +index fb6c85c5d344..075b1cc342d8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1550,9 +1550,9 @@ config HIGHMEM |