summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-24 15:48:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-24 15:48:12 -0700
commit5e30ca1e44029dad8304976128e3af76e4575cd1 (patch)
tree7b60cb2976501f7dabf7558bfa691088664503b3 /block/blk-merge.c
parentd856f32a86b2b015ab180ab7a55e455ed8d3ccc5 (diff)
parenta284e9d14e35b776807c3a40dd1ff1e05429d4a4 (diff)
downloadop-kernel-dev-5e30ca1e44029dad8304976128e3af76e4575cd1.zip
op-kernel-dev-5e30ca1e44029dad8304976128e3af76e4575cd1.tar.gz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Intel and radeon fixes. Post KS/LC git requests from i915 and radeon stacked up. They are all fixes along with some new pci ids for radeon, and one maintainers file entry. - i915: display fixes and irq fixes - radeon: pci ids, and misc gpuvm, dpm and hdp cache" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (29 commits) MAINTAINERS: Add entry for Renesas DRM drivers drm/radeon: add additional SI pci ids drm/radeon: add new bonaire pci ids drm/radeon: add new KV pci id Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe" drm/radeon: fix active_cu mask on SI and CIK after re-init (v3) drm/radeon: fix active cu count for SI and CIK drm/radeon: re-enable selective GPUVM flushing drm/radeon: Sync ME and PFP after CP semaphore waits v4 drm/radeon: fix display handling in radeon_gpu_reset drm/radeon: fix pm handling in radeon_gpu_reset drm/radeon: Only flush HDP cache for indirect buffers from userspace drm/radeon: properly document reloc priority mask drm/i915: don't try to retrain a DP link on an inactive CRTC drm/i915: make sure VDD is turned off during system suspend drm/i915: cancel hotplug and dig_port work during suspend and unload drm/i915: fix HPD IRQ reenable work cancelation drm/i915: take display port power domain in DP HPD handler drm/i915: Don't try to enable cursor from setplane when crtc is disabled drm/i915: Skip load detect when intel_crtc->new_enable==true ...
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud