summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-11-17 15:46:12 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-11-17 15:46:12 +0100
commit898e074ff260469ecc45d7b4313f0c66cff0b154 (patch)
tree9df7c8ed6ded71abf3fc1d523603657d9b488cdf /kernel.spec
parent34e9b62fcf8ef6aa4dc62116d3dc0a40a7e71eae (diff)
parentf222378c29793d1e7ecc30f992206a42766b7623 (diff)
downloadkernel-898e074ff260469ecc45d7b4313f0c66cff0b154.tar.gz
kernel-898e074ff260469ecc45d7b4313f0c66cff0b154.tar.xz
kernel-898e074ff260469ecc45d7b4313f0c66cff0b154.zip
merge origin
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 3b9aaebda..e96825cc0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 101
+%global distro_build 100
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -128,7 +128,7 @@ Summary: The Linux kernel
%define rpmversion 5.14.18
%define patchversion 5.14
-%define pkgrelease 101
+%define pkgrelease 100
# This is needed to do merge window version magic
%define patchlevel 14
@@ -2963,6 +2963,10 @@ fi
#
#
%changelog
+* Fri Nov 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.18-1]
+- usb: xhci: tegra: Check padctrl interrupt presence in device tree (Dmitry Osipenko)
+- Input: i8042 - Add quirk for Fujitsu Lifebook T725 (Takashi Iwai)
+
* Mon Nov 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.17-1]
- btrfs: fix memory ordering between normal and ordered work functions (Nikolay Borisov)
- Turn on COMMON_CLK_AXG_AUDIO for Fedora rhbz 2020481 (Justin M. Forbes)