diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
commit | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (patch) | |
tree | f49795de3f8aaae86e73f6a1f21b7b1948048311 /0001-put-RHEL-info-into-generated-headers.patch | |
parent | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (diff) | |
parent | 427e0b0cd9f365866f7b2517c77ed712f5df9cc7 (diff) | |
download | kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.gz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.xz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.1.vanilla.2.fc34kernel-5.9.0-0.rc2.1.vanilla.2.fc33kernel-5.9.0-0.rc2.1.vanilla.2.fc32kernel-5.9.0-0.rc2.1.vanilla.2.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 4503dbac9..81fc2b47f 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 9cac6fde3479..1434a354290f 100644 +index f21168154160..83033334b565 100644 --- a/Makefile +++ b/Makefile -@@ -1250,7 +1250,13 @@ endef +@@ -1249,7 +1249,13 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ |