diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-put-RHEL-info-into-generated-headers.patch | |
parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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 a2afcbf29..0f3df37c2 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 992d24467ca0..53bbe4be5a69 100644 +index 168dd19cad7c..b70997f7ddf9 100644 --- a/Makefile +++ b/Makefile -@@ -1245,7 +1245,13 @@ endef +@@ -1246,7 +1246,13 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ |