diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-11 16:57:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-11 16:57:56 +0200 |
| commit | 7c560cced273f00fd01f151cdcbfed021d16ef00 (patch) | |
| tree | 2ebcd4001c7b18f883dda4f219dcc476bbc440d5 /0001-put-RHEL-info-into-generated-headers.patch | |
| parent | cc7181fc13a9960b07cfd2d4d96b6da20b6be3bc (diff) | |
| parent | ce2585656b05537b545b5d5ad88a1b9719d24777 (diff) | |
| download | kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.tar.gz kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.tar.xz kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc5.1.vanilla.1.fc33kernel-5.7.0-0.rc5.1.vanilla.1.fc32kernel-5.7.0-0.rc5.1.vanilla.1.fc31kernel-5.7.0-0.rc5.1.vanilla.1.fc30
Diffstat (limited to '0001-put-RHEL-info-into-generated-headers.patch')
| -rw-r--r-- | 0001-put-RHEL-info-into-generated-headers.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch index e0efac5ac..4908fca71 100644 --- a/0001-put-RHEL-info-into-generated-headers.patch +++ b/0001-put-RHEL-info-into-generated-headers.patch @@ -59,10 +59,10 @@ Acked-by: Prarit Bhargava <prarit@redhat.com> 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3512f7b243dc..cd977cfcb8e1 100644 +index 11fe9b1535de..4a9877c61db5 100644 --- a/Makefile +++ b/Makefile -@@ -1183,7 +1183,13 @@ endef +@@ -1190,7 +1190,13 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ |