summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-12-13 08:57:04 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-12-13 08:57:04 +0100
commitf833e29b73c69a5d521b2cf26a550ebc7660f909 (patch)
treedc834f0f89844195d5c8bf5b2db213dd4c0ac29d /kernel.spec
parent15c74107487672e89f163fb42f40cc7193673bc5 (diff)
parentff218a4ef1fc7a59f77fa3f09f1b46f4629bc12d (diff)
downloadkernel-f833e29b73c69a5d521b2cf26a550ebc7660f909.tar.gz
kernel-f833e29b73c69a5d521b2cf26a550ebc7660f909.tar.xz
kernel-f833e29b73c69a5d521b2cf26a550ebc7660f909.zip
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec16
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 1d5390275..374dc38e1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -883,6 +883,16 @@ Patch535: 0001-libertas-fix-a-potential-NULL-pointer-dereference.patch
# rhbz 1769600
Patch536: powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch
+# rhbz 1781762
+Patch537: 0001-bdev-Factor-out-bdev-revalidation-into-a-common-help.patch
+Patch538: 0002-bdev-Refresh-bdev-size-for-disks-without-partitionin.patch
+
+# ALSA code from v5.5 (Intel ASoC Sound Open Firmware driver support)
+Patch600: alsa-5.5.patch
+
+# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support)
+Patch607: alsa-5.6.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1751,6 +1761,9 @@ BuildKernel() {
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/internal
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
+ # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of
+ # testing so just delete
+ find . -name *.h.s -delete
# first copy everything
cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
@@ -2584,6 +2597,9 @@ fi
#
#
%changelog
+* Tue Dec 10 2019 Laura Abbott <labbott@redhat.com>
+- Fix for DVD reading (rhbz 1781762)
+
* Wed Dec 04 2019 Jeremy Cline <jcline@redhat.com> - 5.4.2-300
- Linux v5.4.2