diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-put-RHEL-info-into-generated-headers.patch | |
parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch index e7aa3486d..c9c0d01ee 100644 --- a/0001-put-RHEL-info-into-generated-headers.patch +++ b/0001-put-RHEL-info-into-generated-headers.patch @@ -1,4 +1,4 @@ -From 011b97c3927ab43e0d677c7beecff6e23b30c99d Mon Sep 17 00:00:00 2001 +From 3220c7deb535d2ace4e8cba92dca47aa795138e5 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Mon, 7 Jan 2019 20:55:21 +0000 Subject: [PATCH] put RHEL info into generated headers @@ -59,7 +59,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com> 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 49b2709ff44e..0808100e660f 100644 +index 679f302a8b8b..57e5c3262659 100644 --- a/Makefile +++ b/Makefile @@ -1183,7 +1183,13 @@ endef @@ -75,8 +75,8 @@ index 49b2709ff44e..0808100e660f 100644 + $(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \ + echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"' endef - + $(version_h): FORCE -- -2.26.0 +2.26.2 |