summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_debugfs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-09-08 20:16:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2020-09-08 20:16:11 +0200
commit6f6a73c8b715d595977774d48450a734297ab21f (patch)
tree9088e1f6085dcb2952185f7c997c3491fa7a7daf /drivers/scsi/scsi_debugfs.h
parentMerge tag 'livepatching-for-5.9-rc5' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentRevert "drm/i915/gem: Delete unused code" (diff)
downloadlinux-6f6a73c8b715d595977774d48450a734297ab21f.tar.xz
linux-6f6a73c8b715d595977774d48450a734297ab21f.zip
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/scsi_debugfs.h')
0 files changed, 0 insertions, 0 deletions