summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-06-27 08:10:20 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-06-27 08:10:20 +0200
commit029e9d34192bbe967e4281d59b418fc57d25d588 (patch)
tree42c396cc4e25f06bdb2bdc0c8f844763d9d77ec2 /kernel.spec
parent191366a3912489dbf297d306501d6851c43fb541 (diff)
parent6cb99dafc0bc44e2eabdd04e0452f716362b0513 (diff)
downloadkernel-029e9d34192bbe967e4281d59b418fc57d25d588.tar.gz
kernel-029e9d34192bbe967e4281d59b418fc57d25d588.tar.xz
kernel-029e9d34192bbe967e4281d59b418fc57d25d588.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index d86c529e0..aee3bc633 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -577,6 +577,8 @@ Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch
Patch332: bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
+Patch333: bcm2835-vchiq-use-interruptible-waits.patch
+
# Tegra bits
Patch340: arm64-tegra-jetson-tx1-fixes.patch
@@ -585,7 +587,7 @@ Patch350: arm64-qcom-pinctrl-support-for-ACPI.patch
Patch351: arm64-acpi-ignore-5.1-fadts-reported-as-5.0.patch
Patch352: arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch
Patch353: arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch
-
+Patch354: arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch
# 400 - IBM (ppc/s390x) patches