summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-09-26 18:39:01 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-09-26 18:39:01 +0200
commitca6754ae59927c634cd4dbdf99ee76616735ea7d (patch)
treed142c65e1897b455e8b0d41af7629e39df4fb5df /kernel.spec
parent02c5844e72b8af35f319cae121be661fd95678ce (diff)
parenta91ad5a9c53c64c9d29546f24e4e59d4dfd5427c (diff)
downloadkernel-ca6754ae59927c634cd4dbdf99ee76616735ea7d.tar.gz
kernel-ca6754ae59927c634cd4dbdf99ee76616735ea7d.tar.xz
kernel-ca6754ae59927c634cd4dbdf99ee76616735ea7d.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 6e8a19785..4c5fd48cb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -883,6 +883,9 @@ Patch103: arm64-tegra-Use-valid-PWM-period-for-VDD_GPU-on-Tegra210.patch
# Goes away with 5.9
Patch105: 0001-platform-x86-thinkpad_acpi-lap-or-desk-mode-interfac.patch
+# https://patchwork.kernel.org/patch/11796255/
+Patch106: arm64-dts-rockchip-disable-USB-type-c-DisplayPort.patch
+
# https://bugzilla.redhat.com/show_bug.cgi?id=1874117
Patch107: 0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch