summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-11-25 11:31:01 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-11-25 11:31:01 +0100
commit192536c53f6baff7a27a20d83a60c97643940a6e (patch)
treef53eceb89ba04f8144808e87585bb43d7f3da8ba /kernel.spec
parent317da9ec744ba53872da8390775d2a5f2737faee (diff)
parent507930136440ba39dd1f2b42ac762a39beb35203 (diff)
downloadkernel-192536c53f6baff7a27a20d83a60c97643940a6e.tar.gz
kernel-192536c53f6baff7a27a20d83a60c97643940a6e.tar.xz
kernel-192536c53f6baff7a27a20d83a60c97643940a6e.zip
merge origin
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 60839f079..6015f00e0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,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
@@ -134,7 +134,7 @@ Summary: The Linux kernel
%define rpmversion 5.15.4
%define patchversion 5.15
-%define pkgrelease 100
+%define pkgrelease 101
# This is needed to do merge window version magic
%define patchlevel 15
@@ -2978,6 +2978,9 @@ fi
#
#
%changelog
+* Tue Nov 23 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-101]
+- Revert "fuse: fix page stealing" (Justin M. Forbes)
+
* Mon Nov 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0]
- mwifiex_usb: Fix skb_over_panic in mwifiex_usb_recv (Zekun Shen)
- atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_wait (Zekun Shen)