diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-15 20:09:46 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-15 20:09:46 +0100 |
commit | 82b13176858df75c68fbf91fe8c953d5775aef7c (patch) | |
tree | 1c8e7205d92b28e100521a6f22a5e6220d58009b | |
parent | a09ec90e080ac733543ab8f2161e7cb922a1d98f (diff) | |
parent | 382121b4a1014bed9440edad2e83f5f080b05425 (diff) | |
download | kernel-82b13176858df75c68fbf91fe8c953d5775aef7c.tar.gz kernel-82b13176858df75c68fbf91fe8c953d5775aef7c.tar.xz kernel-82b13176858df75c68fbf91fe8c953d5775aef7c.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc29
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 7 | ||||
-rw-r--r-- | sources | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -1 +1 @@ -0e3f1ad80fc8cb0c517fd9a9afb22752b741fa76 +96b95eff4a591dbac582c2590d067e356a18aacb diff --git a/kernel.spec b/kernel.spec index fa4e1a1f5..e7acf6b91 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -112,7 +112,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 @@ -2532,6 +2532,9 @@ fi # # %changelog +* Fri Nov 15 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc7.git2.1 +- Linux v5.4-rc7-68-g96b95eff4a59 + * Thu Nov 14 2019 Laura Abbott <labbott@redhat.com> - 5.4.0-0.rc7.git1.2 - bump and build @@ -1,3 +1,3 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d SHA512 (patch-5.4-rc7.xz) = 0bd727332fc13d43f48497c7587ede034a1ca7df67bae3f6a7dab6001f0b75c858b15d4fa6c0ca5bf71bd467c330f14a92918e8bbc542c7c40f59d2a8f71eeb1 -SHA512 (patch-5.4-rc7-git1.xz) = e91441caa7f3cf03c4034faf45d9e4cd4dfc568e034409b437bfbcdd611481ac3e7624f86e8ccefbcda022bfc23d3a6c232cd766125abeed1f7aaa779221b60a +SHA512 (patch-5.4-rc7-git2.xz) = bb0d3d65dffa95ee10dbc1d56fb233542e49e01981788734c264bb1687cdfa97bbe12649a25c31b16418af180cf4b4653210316d40b0751832363f9adf6b08c3 |