diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 19:32:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 19:32:38 +0200 |
| commit | f7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (patch) | |
| tree | ba1b47ae2358f68977e463a497247f11c432bba8 /0001-put-RHEL-info-into-generated-headers.patch | |
| parent | 17af4ec052a4e628ec6142e19398fdfabb4206e8 (diff) | |
| parent | c0b2feb7cc95ed98798dd3d2aafa0679e81e7918 (diff) | |
| download | kernel-f7ab3f33fe442b453cab73ec62b87ea9a757e0c7.tar.gz kernel-f7ab3f33fe442b453cab73ec62b87ea9a757e0c7.tar.xz kernel-f7ab3f33fe442b453cab73ec62b87ea9a757e0c7.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200612gitb791d1bdf921.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200612gitb791d1bdf921.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200612gitb791d1bdf921.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 1c326618b..8cc3ae7fb 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 839f9fee22cb..d4d2a5c5d003 100644 +index f0c1a3a8d9e4..07e96d9ab020 100644 --- a/Makefile +++ b/Makefile -@@ -1230,7 +1230,13 @@ endef +@@ -1231,7 +1231,13 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ |