summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-13 18:25:13 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-13 18:25:13 +0100
commit527c790fb66c203af321e8d6bae2882a69a35def (patch)
treee2a7581228314332935d6212948bc4dfa34b1642 /kernel.spec
parent4a9f3c0b3c198d4eca0d4a1f8bc13f2be4968f15 (diff)
parent33509b1f24d13aff9855b4b775ceff6dae41acfb (diff)
downloadkernel-527c790fb66c203af321e8d6bae2882a69a35def.tar.gz
kernel-527c790fb66c203af321e8d6bae2882a69a35def.tar.xz
kernel-527c790fb66c203af321e8d6bae2882a69a35def.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc5.35.vanilla.1.fc36kernel-5.16.0-0.rc5.35.vanilla.1.fc35kernel-5.16.0-0.rc5.35.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec24
1 files changed, 17 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index be373b649..a107d1846 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc4.20211208git2a987e65025e.31
+%global distro_build 0.rc5.35
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
%define rpmversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc4.20211208git2a987e65025e.31
+%define pkgrelease 0.rc5.35
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20211208git2a987e65025e.31%{?buildid}%{?dist}
+%define specrelease 0.rc5.35%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -691,7 +691,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc4-31-g2a987e65025e.tar.xz
+Source0: linux-5.16-rc5.tar.xz
Source1: Makefile.rhelver
@@ -1385,8 +1385,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc4-31-g2a987e65025e -c
-mv linux-5.16-rc4-31-g2a987e65025e linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc5 -c
+mv linux-5.16-rc5 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2199,7 +2199,7 @@ InitBuildVars
%global perf_build_extra_opts CORESIGHT=1
%endif
%global perf_make \
- %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
+ %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
%if %{with_perf}
# perf
# make sure check-headers.sh is executable
@@ -2987,6 +2987,16 @@ fi
#
#
%changelog
+* Mon Dec 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.16-0.rc5.35]
+- pci.h: Fix static include (Prarit Bhargava)
+
+* Sun Dec 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211212gita763d5a5abd6.34]
+- Enable CONFIG_VFIO_NOIOMMU for Fedora (Justin M. Forbes)
+
+* Fri Dec 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211210gitc741e49150db.32]
+- redhat/configs: enable CONFIG_NTB_NETDEV for ark (John W. Linville)
+- drivers/pci/pci-driver.c: Fix if/ifdef typo (Prarit Bhargava)
+
* Wed Dec 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211208git2a987e65025e.31]
- common: arm64: ensure all the required arm64 errata are enabled (Peter Robinson)
- kernel/rh_taint.c: Update to new messaging (Prarit Bhargava) [2019377]