]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'msm-fixes-4.2' of git://people.freedesktop.org/~robclark/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 30 Jul 2015 02:41:44 +0000 (12:41 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 30 Jul 2015 02:41:44 +0000 (12:41 +1000)
Fix for nasty crash on mdp4 in disable path, fix for dma-buf export,
smb leak on mdp5 which could result in intermittent modeset fails, and
don't let interrupted system call disturb atomic commit once we are
past the point of no return.

* 'msm-fixes-4.2' of git://people.freedesktop.org/~robclark/linux:
  drm/msm/mdp5: release SMB (shared memory blocks) in various cases
  drm/msm: change to uninterruptible wait in atomic commit
  drm/msm: mdp4: Fix drm_framebuffer dereference crash
  drm/msm: fix msm_gem_prime_get_sg_table()


Trivial merge