summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-03-17 10:03:02 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-03-17 10:03:02 +0100
commitda8eee46cad42bd26bfbb454a01e0462a52402ea (patch)
tree30a3bce9da08396cc80438588e83c2e57eb56c23 /kernel.spec
parentb267c409de90577ececbbe6ae704a0d1dd86a383 (diff)
parent4b96d0066110c20b6a0689d3376a294c64d84a76 (diff)
downloadkernel-da8eee46cad42bd26bfbb454a01e0462a52402ea.tar.gz
kernel-da8eee46cad42bd26bfbb454a01e0462a52402ea.tar.xz
kernel-da8eee46cad42bd26bfbb454a01e0462a52402ea.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 f61d9e538..c57ef8735 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 100
+%global distro_build 101
%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 100
+%define pkgrelease 101
# 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)