diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-01 16:17:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-01 16:17:02 +0200 |
commit | 84993145b19659c6a937a7b46f63eba05487e184 (patch) | |
tree | 7c994f3e0606cb627d423823842b07692a0f8f31 | |
parent | aea09d8c56d9f2a1e2eefc415bf53ad4ec6d3074 (diff) | |
parent | d139c9574c9f89a6179eaa697a2cdd76c7b6818f (diff) | |
download | kernel-84993145b19659c6a937a7b46f63eba05487e184.tar.gz kernel-84993145b19659c6a937a7b46f63eba05487e184.tar.xz kernel-84993145b19659c6a937a7b46f63eba05487e184.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc7.git2.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc7.git2.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc7.git2.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc7.git2.1.vanilla.knurd.1.fc28
-rw-r--r-- | configs/config_generation | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 5 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/configs/config_generation b/configs/config_generation index 97683c517..b3385fd1c 100644 --- a/configs/config_generation +++ b/configs/config_generation @@ -18,7 +18,7 @@ i686-debug=generic:generic-x86:generic-x86-i686:debug:debug-x86 # ppc64le ppc64le=generic:generic-powerpc -ppc64le-debug=generic:generic-powerpc:generic-powerpc:debug +ppc64le-debug=generic:generic-powerpc:debug # s390x s390x=generic:generic-s390x @@ -1 +1 @@ -83a50840e72a5a964b4704fcdc2fbb2d771015ab +f2bc9c908dfe3f56fe4ca4d92e5c5be80963b973 diff --git a/kernel.spec b/kernel.spec index 28e0dd133..fcd9f7927 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1842,6 +1842,9 @@ fi # # %changelog +* Wed May 01 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc7.git2.1 +- Linux v5.1-rc7-16-gf2bc9c908dfe + * Tue Apr 30 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc7.git1.1 - Linux v5.1-rc7-5-g83a50840e72a @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc7.xz) = 8e2c0f9843f08c9911ca14dedaed48ee1995bb12aec9b1e718d3f4cc23d8a0e8d21c368d40f78a43dcdea628e617a190344f0b6c63a4311a36d906da84d98702 -SHA512 (patch-5.1-rc7-git1.xz) = 069dc86021b0493ff0d4443add1110ad795e673ea5fc4b0a34bd89384c3f608e27b339dc27154dd3b0c2c91d696f2b2bd52fb769c0d83ae63303d86dfdb08316 +SHA512 (patch-5.1-rc7-git2.xz) = 520ac732bea64acde2e16cb702446d63e8b69732484e48cd0e2bc59add257ccba49147f59865f8a97c3987f3657eb034c58c7c2295af3651aeaacc4f87033e29 |