From: Dave Airlie Date: Sat, 1 Nov 2014 23:23:31 +0000 (+1000) Subject: Merge branch 'vmwgfx-fixes-3.18' of git://people.freedesktop.org/~thomash/linux X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10a8fce846c1b12ebb29b036d1a15efc65eddbb5;p=linux-beck.git Merge branch 'vmwgfx-fixes-3.18' of git://people.freedesktop.org/~thomash/linux A critical 3.18 regression fix from Rob, (thanks!) A fix to avoid advertizing modes we can't support from Sinclair (welcome Sinclair!) and a fix for an incorrect hash key computation from me that is completely harmless, but can wait 'til the next merge window if necessary. (I can't really bother stable with this one). * 'vmwgfx-fixes-3.18' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size. drm/vmwgfx: Fix hash key computation drm/vmwgfx: fix lock breakage --- 10a8fce846c1b12ebb29b036d1a15efc65eddbb5