tree cec8305aa57cdb654b937ec8ef9d542242f62488
parent 63a1281b651b8ebc04c829254c62bd6fbaf83eb0
parent c12d2da56d0e07d230968ee2305aaa86b93a6832
author Linus Torvalds <torvalds@linux-foundation.org> 1460687494 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1460687494 -0700

Merge branch 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull mm gup cleanup from Ingo Molnar:
 "This removes the ugly get-user-pages API hack, now that all upstream
  code has been migrated to it"

("ugly" is putting it mildly. But it worked.. - Linus)

* 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  mm/gup: Remove the macro overload API migration helpers from the get_user*() APIs