diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-16 06:21:49 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-16 06:21:49 +0200 |
| commit | f6340ff9f75bda4bcf1234f7219444b04617f783 (patch) | |
| tree | f80da4542db0af8aa47c931eed5d897da69b863e /patch-5.15-redhat.patch | |
| parent | 9cd7866304b2d5b845de31768b54f7effb5996a7 (diff) | |
| parent | 0ae80aee4e3460b177d613292b3d8af13414d8c2 (diff) | |
| download | kernel-f6340ff9f75bda4bcf1234f7219444b04617f783.tar.gz kernel-f6340ff9f75bda4bcf1234f7219444b04617f783.tar.xz kernel-f6340ff9f75bda4bcf1234f7219444b04617f783.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc1.20210915git3ca706c189db.13.vanilla.1.fc34
Diffstat (limited to 'patch-5.15-redhat.patch')
| -rw-r--r-- | patch-5.15-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 546707328..06b913976 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -141,7 +141,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 7cfe4ff36f44..eab999eeb925 100644 +index 34a0afc3a8eb..621ea3c850a9 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -155,7 +155,7 @@ index 7cfe4ff36f44..eab999eeb925 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1269,7 +1273,13 @@ define filechk_version.h +@@ -1263,7 +1267,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -187,7 +187,7 @@ index fc196421b2ce..0a6b267128ae 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 077f2ec4eeb2..d33c848032c3 100644 +index 5c7ae4c3954b..7c81c15fc327 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -911,7 +911,7 @@ endchoice |