summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-29 16:54:34 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-29 16:54:34 +0200
commitdd295116a4a05cecc6af37c0150cb51546f963de (patch)
treee651b1a60f45ad8000a8fed2fcf2885b9ab89f09 /kernel.spec
parent7a69a4176cc514cdf4d61d3645937a4774d87bbb (diff)
parent7213e886c30d95453bff7ffdb840e34331ed2615 (diff)
downloadkernel-dd295116a4a05cecc6af37c0150cb51546f963de.tar.gz
kernel-dd295116a4a05cecc6af37c0150cb51546f963de.tar.xz
kernel-dd295116a4a05cecc6af37c0150cb51546f963de.zip
Merge remote-tracking branch 'origin/f31' into f31-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 34dd7def2..7529c4ede 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -917,6 +917,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
@@ -2949,6 +2952,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-200
- Linux v5.6.7