summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-ice-mark-driver-as-tech-preview.patch2
-rw-r--r--kernel.spec16
-rw-r--r--sources6
3 files changed, 14 insertions, 10 deletions
diff --git a/0001-ice-mark-driver-as-tech-preview.patch b/0001-ice-mark-driver-as-tech-preview.patch
index f40b9511d..8563ea43a 100644
--- a/0001-ice-mark-driver-as-tech-preview.patch
+++ b/0001-ice-mark-driver-as-tech-preview.patch
@@ -27,7 +27,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 082825e3cb39..93e22d1fbbb7 100644
+index 4cbd49c87568..aa9baa923fd9 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3771,6 +3771,7 @@ static int __init ice_module_init(void)
diff --git a/kernel.spec b/kernel.spec
index d093eb7c8..a807614b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc2.20200625git8be3a53e18e0.1
+%global distro_build 0.rc2.20200626git4a21185cda0f.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.8.0
-%define pkgrelease 0.rc2.20200625git8be3a53e18e0.1
+%define pkgrelease 0.rc2.20200626git4a21185cda0f.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20200625git8be3a53e18e0.1%{?buildid}%{?dist}
+%define specrelease 0.rc2.20200626git4a21185cda0f.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200625git8be3a53e18e0.tar.xz
+Source0: linux-20200626git4a21185cda0f.tar.xz
Source1: Makefile.rhelver
@@ -1280,8 +1280,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200625git8be3a53e18e0 -c
-mv linux-20200625git8be3a53e18e0 linux-%{KVERREL}
+%setup -q -n kernel-20200626git4a21185cda0f -c
+mv linux-20200626git4a21185cda0f linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2789,6 +2789,10 @@ fi
#
#
%changelog
+* Fri Jun 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200626git4a21185cda0f.1]
+- 4a21185cda0f rebase
+- Updated changelog for the release based on 8be3a53e18e0 (Fedora Kernel Team)
+
* Thu Jun 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200625git8be3a53e18e0.1]
- 8be3a53e18e0 rebase
- redhat: Replace hardware.redhat.com link in Unsupported message (Prarit Bhargava)
diff --git a/sources b/sources
index 8f069f12d..8f1a9b0b5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200625git8be3a53e18e0.tar.xz) = 76abddfc2fcc7ac48614406cedf3775c004d9103115959052bb23a5bfa6a26376d91a05a0eaad72d3c890252cb1d77d8715297cc6b643fcb92c7381252fc0216
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc2.20200625git8be3a53e18e0.1.tar.bz2) = 68981697eeddb3047823d822fb3cebc7f896648f1055d8db939d927d818ebc943693685e6eb27b681f3b1726b0bf23734d0707ca092f765406131ae01b8b4837
-SHA512 (kernel-kabi-dw-5.8.0-0.rc2.20200625git8be3a53e18e0.1.tar.bz2) = 438c8f9fb053ca6da9257431633027a736ac01cc4b39de4fae77fed3bb9ffdbdd3ed85caf6dd655cddb2cd4923d7f4369dba844afec2635c589cf434f358fb12
+SHA512 (linux-20200626git4a21185cda0f.tar.xz) = 82e0c4635a178cec3d9d1d3880c401f47fa284914dc66cfd18b5f50cb9ea7ee4dcccba8df46e8f7186dafea1e9e02363c89a40f5853481e62e3d95e6fb9e2180
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc2.20200626git4a21185cda0f.1.tar.bz2) = 9b2ed16932f793ec2cfb8c78c293bbe8f7e97f6d492063a2712b70075a46c6f709681532c090893bf89f51d71b194ea5d6f692e1ce4a0e057e06582abe11f9a1
+SHA512 (kernel-kabi-dw-5.8.0-0.rc2.20200626git4a21185cda0f.1.tar.bz2) = 5895ca76e1022d5ce97f76f9d87e2a329c7b02ce3c6862d2f77db01062d2d317f54a4da8820028f43290c565db3cbdf5c3c24191c3ebb8405a347970561de513