diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-put-RHEL-info-into-generated-headers.patch | |
parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
download | kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.gz kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.xz kernel-38d5c149cae32d286308f7962e1d561e7939072f.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31
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 11655b2ab..1c326618b 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 a7bc91cbac8f..cee5c5cda7fc 100644 +index 839f9fee22cb..d4d2a5c5d003 100644 --- a/Makefile +++ b/Makefile -@@ -1196,7 +1196,13 @@ endef +@@ -1230,7 +1230,13 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ |