summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-29 16:54:31 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-29 16:54:31 +0200
commit3e0da71f610f6938d6950c51bee0dc37df4654bc (patch)
tree6143a6d5567830bcd1724b14bcb6787a43634963 /kernel.spec
parenta99631f34642c2de1cd507f9b7d7914f01657f5d (diff)
parent0cf61a1cdf691755b88bc3a13eb7cab638b3f1ef (diff)
downloadkernel-3e0da71f610f6938d6950c51bee0dc37df4654bc.tar.gz
kernel-3e0da71f610f6938d6950c51bee0dc37df4654bc.tar.xz
kernel-3e0da71f610f6938d6950c51bee0dc37df4654bc.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 75c59e34e..cbd801322 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -920,6 +920,9 @@ Patch509: drm-i915-backports.patch
# https://patchwork.ozlabs.org/patch/1260523/
Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch
+Patch512: drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch
+Patch513: 0001-drm-i915-gem-Hold-obj-vma.lock-over-for_each_ggtt_vm.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -3018,6 +3021,10 @@ fi
#
#
%changelog
+* Tue Apr 28 2020 Justin M. Forbes <jforbes@fedoraproject.org>
+- MST Fix from Lyude Paul
+- drm/i915/gem: Hold obj->vma.lock over for_each_ggtt_vma() (airlied request)
+
* Thu Apr 23 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.7-300
- Linux v5.6.7