Merge tag 'drm-next-2020-02-04' of git://anongit.freedesktop.org/drm/drm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Feb 2020 07:21:04 +0000 (07:21 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Feb 2020 07:21:04 +0000 (07:21 +0000)
commit9717c1cea16e3eae81ca226f4c3670bb799b61ad
tree80137d0ab55ed25cce3d7ccb8dde8dc841ee7bdb
parent79703e014ba02ad86af4bcdf0c16e4b208cca406
parentb45f1b3b585e195a7daead16d914e164310b1df6
Merge tag 'drm-next-2020-02-04' of git://anongit.freedesktop.org/drm/drm

Pull drm ttm/mm updates from Dave Airlie:
 "Thomas Hellstrom has some more changes to the TTM layer that needed a
  patch to the mm subsystem.

  This adds a new mm API vmf_insert_mixed_prot to avoid an ugly hack
  that has limitations in the TTM layer"

* tag 'drm-next-2020-02-04' of git://anongit.freedesktop.org/drm/drm:
  mm, drm/ttm: Fix vm page protection handling
  mm: Add a vmf_insert_mixed_prot() function
include/linux/mm.h
include/linux/mm_types.h
mm/memory.c