summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-03-17 10:02:27 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-03-17 10:02:27 +0100
commit915d3812d42c6ea794608b371dee3f7486c3df1a (patch)
treed0c3cc203a0e391c41eb9307a7aa5889a6e90730 /kernel.spec
parent0b06966bc8e0915ad3a379de4091b02298b9f67b (diff)
parent84896a7c5f2fabe6889eaae9a963d87ffdc6e203 (diff)
downloadkernel-915d3812d42c6ea794608b371dee3f7486c3df1a.tar.gz
kernel-915d3812d42c6ea794608b371dee3f7486c3df1a.tar.xz
kernel-915d3812d42c6ea794608b371dee3f7486c3df1a.zip
merge origin
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec15
1 files changed, 12 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 9a77e7923..e0fd2c5d9 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 200
+%global distro_build 201
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -135,7 +135,7 @@ Summary: The Linux kernel
%define rpmversion 5.16.15
%define patchversion 5.16
-%define pkgrelease 200
+%define pkgrelease 201
# This is needed to do merge window version magic
%define patchlevel 16
@@ -2990,8 +2990,17 @@ fi
#
#
%changelog
+* Thu Mar 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.15-1]
+- Back out the nfs workaround and just revert the query for fs_location (Justin M. Forbes)
+
+* Wed Mar 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.15-0]
+- nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION (Jordy Zomer)
+- Restrict FS_LOCATIONS to NFS v4.2+ to work around Qnap knfsd-3.4.6 bug (Justin M. Forbes)
+- Turn on VDPA_SIM_BLOCK (Justin M. Forbes)
+- Fix up changelog (Justin M. Forbes)
+
* Fri Mar 11 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.14-0]
-- Linux v5.16.14
+- Linux v5.16.14 (Justin M. Forbes)
* Tue Mar 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.13-0]
- Add config for ARM64_ERRATUM_2077057 (Justin M. Forbes)