tree 8728f728c85f9c94d0158a634581b3f90d50d65b
parent 24c82fbb86c675bc265d2bd815d17c4861c50580
parent 92181d47ee74749bdf902f080dab9fa9ef44b37f
author Linus Torvalds <torvalds@linux-foundation.org> 1464194270 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1464194270 -0700

Merge tag 'drm-4.7-rc1-headers-fix' of git://people.freedesktop.org/~airlied/linux

Pull header warning fix from Dave Airlie:
 "Here is the C++ guards warning fix from Arnd"

[ Background: there are 'extern "C" { }' guards in include/uapi for the
  GPU headers.

  They should arguably be wrapped somehow, but as it is they caused
  checkpatch to warn because it would trigger on the 'extern' and think
  it's exporting a function or variable from the kernel to user space.

  This just fixes checkpatch.  Whether we wrap the C++ guards some way
  in the future will be an independent issue. ]

* tag 'drm-4.7-rc1-headers-fix' of git://people.freedesktop.org/~airlied/linux:
  headers_check: don't warn about c++ guards