diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-04 08:21:04 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-04 08:21:04 +0100 |
commit | 9717c1cea16e3eae81ca226f4c3670bb799b61ad (patch) | |
tree | 80137d0ab55ed25cce3d7ccb8dde8dc841ee7bdb /drivers/zorro/proc.c | |
parent | Merge tag 'tag-chrome-platform-for-v5.6' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux in... (diff) | |
download | linux-9717c1cea16e3eae81ca226f4c3670bb799b61ad.tar.xz linux-9717c1cea16e3eae81ca226f4c3670bb799b61ad.zip |
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
Diffstat (limited to 'drivers/zorro/proc.c')
0 files changed, 0 insertions, 0 deletions