Merge remote branch 'linus/master' into drm-intel-fixes

Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c

diff --combined drivers/gpu/drm/Kconfig
index 3a061094345b3927536b0620ffc7dda1467976dc,bea966f8ac84c96b3e02c908c146637c7ef7e7d1..0902d44600394fd1d6888bd6e5065bda884d2e03
--- 1/drivers/gpu/drm/Kconfig
--- 2/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -23,7 -23,7 +23,7 @@@ config DRM_KMS_HELPE
        tristate
        depends on DRM
        select FB
-       select FRAMEBUFFER_CONSOLE if !EMBEDDED
+       select FRAMEBUFFER_CONSOLE if !EXPERT
        help
          FB and CRTC helpers for KMS drivers.
  
@@@ -100,10 -100,7 +100,10 @@@ config DRM_I83
  config DRM_I915
        tristate "i915 driver"
        depends on AGP_INTEL
 +      # we need shmfs for the swappable backing store, and in particular
 +      # the shmem_readpage() which depends upon tmpfs
        select SHMEM
 +      select TMPFS
        select DRM_KMS_HELPER
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA