summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-07 16:03:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-07 16:03:55 +0200
commitfea02dbd16c04b9501a97a2e2ed2eb72fb086c76 (patch)
tree08ceb43378f200003f99397b208fe6de5d25278d /kernel.spec
parent2f00d5d1307017b0c8fb556f78d14749e9b742db (diff)
parent4bc3c54f38c58c791541b236f9eb475eac98b8bf (diff)
downloadkernel-fea02dbd16c04b9501a97a2e2ed2eb72fb086c76.tar.gz
kernel-fea02dbd16c04b9501a97a2e2ed2eb72fb086c76.tar.xz
kernel-fea02dbd16c04b9501a97a2e2ed2eb72fb086c76.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.38.vanilla.1.fc35kernel-5.13.0-0.rc5.38.vanilla.1.fc34kernel-5.13.0-0.rc5.38.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec17
1 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index d8645c086..744402808 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc4.20210603git324c92e5e0ee.35
+%global distro_build 0.rc5.38
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -119,13 +119,13 @@ Summary: The Linux kernel
%define kversion 5.13
%define rpmversion 5.13.0
-%define pkgrelease 0.rc4.20210603git324c92e5e0ee.35
+%define pkgrelease 0.rc5.38
# This is needed to do merge window version magic
%define patchlevel 13
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20210603git324c92e5e0ee.35%{?buildid}%{?dist}
+%define specrelease 0.rc5.38%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -649,7 +649,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc4-61-g324c92e5e0ee.tar.xz
+Source0: linux-5.13-rc5.tar.xz
Source1: Makefile.rhelver
@@ -1318,8 +1318,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.13-rc4-61-g324c92e5e0ee -c
-mv linux-5.13-rc4-61-g324c92e5e0ee linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc5 -c
+mv linux-5.13-rc5 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2873,7 +2873,7 @@ fi
#
#
%changelog
-* Thu Jun 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210603git324c92e5e0ee.35]
+* Mon Jun 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.38]
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
@@ -2905,6 +2905,9 @@ fi
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
+* Sat Jun 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210604gitf88cd3fb9df2.36]
+- RHEL: disable io_uring support (Jeff Moyer)
+
* Thu Jun 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210603git324c92e5e0ee.34]
- all: Changing CONFIG_UV_SYSFS to build uv_sysfs.ko as a loadable module. (Frank Ramsay)
- Enable NITRO_ENCLAVES on RHEL (Vitaly Kuznetsov)