diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-01 10:48:49 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-01 10:48:49 -0600 |
| commit | 51aea159355a5cbfab3df1ad553d6a45728c77f0 (patch) | |
| tree | bccf260ffa3b0194e923e448132079266c36f77e /patch-5.12.0-redhat.patch | |
| parent | 7fe267231b1b6f424be7972f8ff7ec0afb4bddad (diff) | |
| download | kernel-51aea159355a5cbfab3df1ad553d6a45728c77f0.tar.gz kernel-51aea159355a5cbfab3df1ad553d6a45728c77f0.tar.xz kernel-51aea159355a5cbfab3df1ad553d6a45728c77f0.zip | |
kernel-5.12.0-0.rc1.162
* Mon Mar 01 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.0-0.rc1.162]
- Fix merge issue (Justin M. Forbes)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.12.0-redhat.patch')
| -rw-r--r-- | patch-5.12.0-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 42bf396f8..40de102c9 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -201,7 +201,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index f9b54da2fca0..77582ee9b1a3 100644 +index f9b54da2fca0..e2333c46d848 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -228,7 +228,7 @@ index f9b54da2fca0..77582ee9b1a3 100644 echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ - echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) -+ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) \ ++ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \ + echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \ + echo '#define RHEL_MINOR $(RHEL_MINOR)'; \ + echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \ |