From: Linus Torvalds Date: Thu, 26 Jan 2017 16:55:33 +0000 (-0800) Subject: Merge tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airli... X-Git-Tag: MMI-PSA29.97-13-9~6333 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bed7b016091d2f9bdc3f3c28899b33adab7c4786;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux Pull drm revert from Dave Airlie: "Revert one patch missing some prereqs. One of the connector fixes was missing some prereqs, we have an alternate driver fix that should work that I'll send tomorrow. Today is a holiday here so quickly smashing this out" Daniel Vetter explains: "I pushed a locking change to fix a nouveau rpm issue to -fixes that needed the connector_list rework. And that's only in -next, but I missed that. Dave has the revert in a pull, and he'll follow-up with the hack nouveau patch for 4.10, and then we'll reapply the proper fix again for -next and revert the hacks. A bit a mess, but should be sorted soon" * tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux: Revert "drm/probe-helpers: Drop locking from poll_enable" --- bed7b016091d2f9bdc3f3c28899b33adab7c4786