1. 14 12月, 2015 5 次提交
  2. 11 12月, 2015 1 次提交
    • D
      Merge branch 'drm-header-fixes' of https://github.com/GabrielL/linux into drm-next · 663a233e
      Dave Airlie 提交于
      Fix all the problems with the header files and userspace builds
      off them. I really care so little about this, but hey who am
      I to stop progress.
      
      * 'drm-header-fixes' of https://github.com/GabrielL/linux: (30 commits)
        drm: fix inclusion of drm.h in via_drm.h
        drm: fix inclusion of drm.h in vmwgfx_drm.h
        drm: fix inclusion of drm.h in virtgpu_drm.h
        drm: fix inclusion of drm.h in tegra_drm.h
        drm: fix inclusion of drm.h in savage_drm.h
        drm: fix inclusion of drm.h in r128_drm.h
        drm: fix inclusion of drm.h in qxl_drm.h
        drm: fix inclusion of drm.h in omap_drm.h
        drm: fix inclusion of drm.h in msm_drm.h
        drm: fix inclusion of drm.h in mga_drm.h
        drm: fix inclusion of drm.h in exynos_sarea.h
        drm: fix inclusion of drm.h in i810_drm.h
        drm: fix inclusion of drm.h in exynos_sarea.h
        drm: fix inclusion of drm.h in drm_sarea.h
        drm: drm_mode.h fix includes
        drm: drm_fourcc.h fix includes
        drm: include drm.h in armada_drm.h
        include/uapi/drm/amdgpu_drm.h: use __u32 and __u64 from <linux/types.h>
        drm: Kbuild: add admgpu_drm.h to the installed headers
        drm: use __u{32,64} instead of uint{32,64}_t in virtgpu_drm.h
        ...
      663a233e
  3. 10 12月, 2015 30 次提交
  4. 08 12月, 2015 1 次提交
  5. 07 12月, 2015 3 次提交
    • D
      Merge tag 'topic/drm-misc-2015-12-04' of git://anongit.freedesktop.org/drm-intel into drm-next · 47c0fd72
      Dave Airlie 提交于
      New -misc pull. Big thing is Thierry's atomic helpers for system suspend
      resume, which I'd like to use in i915 too. Hence the pull.
      
      * tag 'topic/drm-misc-2015-12-04' of git://anongit.freedesktop.org/drm-intel:
        drm: keep connector status change logging human readable
        drm/atomic-helper: Reject attempts at re-stealing encoders
        drm/atomic-helper: Implement subsystem-level suspend/resume
        drm: Implement drm_modeset_lock_all_ctx()
        drm/gma500: Add driver private mutex for the fault handler
        drm/gma500: Drop dev->struct_mutex from mmap offset function
        drm/gma500: Drop dev->struct_mutex from fbdev init/teardown code
        drm/gma500: Drop dev->struct_mutex from modeset code
        drm/gma500: Use correct unref in the gem bo create function
        drm/edid: Make the detailed timing CEA/HDMI mode fixup accept up to 5kHz clock difference
        drm/atomic_helper: Add drm_atomic_helper_disable_planes_on_crtc()
        drm: Serialise multiple event readers
        drm: Drop dev->event_lock spinlock around faulting copy_to_user()
      47c0fd72
    • L
      Linux 4.4-rc4 · 527e9316
      Linus Torvalds 提交于
      527e9316
    • J
      staging/lustre: remove IOC_LIBCFS_PING_TEST ioctl · d035e336
      James Simmons 提交于
      The ioctl IOC_LIBCFS_PING_TEST has not been used in ages.  The recent
      nidstring changes which moved all the nidstring operations from libcfs
      to the LNet layer but this ioctl code was still using an nidstring
      operation that was causing a circular dependency loop between libcfs and
      LNet.
      Signed-off-by: NJames Simmons <jsimmons@infradead.org>
      Signed-off-by: NOleg Drokin <green@linuxhacker.ru>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d035e336