diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-08 11:16:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-08 11:16:11 -0700 |
| commit | 6f6a73c8b715d595977774d48450a734297ab21f (patch) | |
| tree | 9088e1f6085dcb2952185f7c997c3491fa7a7daf /drivers/scsi/libsas/sas_ata.c | |
| parent | 612ab8ad64140f0f291d7baae45982ce7119839a (diff) | |
| parent | 20561da3a2e1e0e827ef5510cb0f74bcfd377e41 (diff) | |
Merge tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie:
"The i915 reverts are going to be a bit of a conflict mess for next, so
I decided to dequeue them now, along with some msm fixes for a ring
corruption issue, that Rob sent over the weekend.
Summary:
i915:
- revert gpu relocation changes due to regression
msm:
- fixes for RPTR corruption issue"
* tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm:
Revert "drm/i915/gem: Delete unused code"
Revert "drm/i915/gem: Async GPU relocations only"
Revert "drm/i915: Remove i915_gem_object_get_dirty_page()"
drm/msm: Disable the RPTR shadow
drm/msm: Disable preemption on all 5xx targets
drm/msm: Enable expanded apriv support for a650
drm/msm: Split the a5xx preemption record
Diffstat (limited to 'drivers/scsi/libsas/sas_ata.c')
0 files changed, 0 insertions, 0 deletions