Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 31 Jan 2020 05:18:21 +0000 (15:18 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 31 Jan 2020 06:58:35 +0000 (16:58 +1000)
A small fix for the long-standing ttm vm page protection hack.

Sent as a separate PR as it touches mm, has all acks in place.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellström (VMware) <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200116102411.3056-1-thomas_os@shipmail.org
1  2 
include/linux/mm.h
mm/memory.c

Simple merge
diff --cc mm/memory.c
Simple merge