diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-19 21:14:03 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-19 21:14:03 +0200 |
| commit | ec4d166e3c82e11f05003fe10b21754be0ee9fcd (patch) | |
| tree | 350ae09d614a48e574dd96126b3d282e4325224e /patch-5.12.0-redhat.patch | |
| parent | 9b95018454e316c3b9063b1092bb91734cc7dae2 (diff) | |
| parent | 21a7c14e34a6bdcb8841f7f958b2d39626ab3ed8 (diff) | |
| download | kernel-ec4d166e3c82e11f05003fe10b21754be0ee9fcd.tar.gz kernel-ec4d166e3c82e11f05003fe10b21754be0ee9fcd.tar.xz kernel-ec4d166e3c82e11f05003fe10b21754be0ee9fcd.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc8.191.vanilla.1.fc35kernel-5.12.0-0.rc8.191.vanilla.1.fc34kernel-5.12.0-0.rc8.191.vanilla.1.fc33kernel-5.12.0-0.rc8.191.vanilla.1.fc32
Diffstat (limited to 'patch-5.12.0-redhat.patch')
| -rw-r--r-- | patch-5.12.0-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 3d58921e5..aff8c61da 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -140,7 +140,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 4730cf156f6b..190e162d82e9 100644 +index bc19584fee59..3251d831d4da 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -178,10 +178,10 @@ index 4730cf156f6b..190e162d82e9 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 5da96f5df48f..a35494d5910d 100644 +index 2fae14857dcf..ce5c2eb4b5ff 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1475,9 +1475,9 @@ config HIGHMEM +@@ -1481,9 +1481,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE |