summaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-24 07:08:52 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-24 07:08:52 +0300
commitba25b50d582ff6c6021eee80824134aeb9ab8785 (patch)
treed6002f77ac65c936b489f21409c9b162acfc3c28 /fs/cifs
parent12a54b150fb5b6c2f3da932dc0e665355f8a5a48 (diff)
parenta0cecc23cfcbf2626497a8c8770856dd56b67917 (diff)
downloadlinux-ba25b50d582ff6c6021eee80824134aeb9ab8785.tar.xz
Merge tag 'drm-fixes-2019-04-24' of git://anongit.freedesktop.org/drm/drm
Pull drm regression fixes from Dave Airlie: "We interrupt your regularly scheduled drm fixes for a regression special. The first is for a fix in i915 that had unexpected side effects fallout in the userspace X.org modesetting driver where X would no longer start. I got tired of the nitpicking and issued a large hammer on it. The X.org driver is buggy, but blackscreen regressions are worse. The second was an oversight that myself and Gerd should have noticed better, Gerd is trying to fix this properly, but the regression is too large to leave, even if the original behaviour is bad in some cases, it's clearly bad to break a bunch of working use cases. I'll likely have a regular fixes pull later, but I really wanted to highlight these" * tag 'drm-fixes-2019-04-24' of git://anongit.freedesktop.org/drm/drm: Revert "drm/virtio: drop prime import/export callbacks" Revert "drm/i915/fbdev: Actually configure untiled displays"
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions