Merge branch 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2016 02:31:34 +0000 (19:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2016 02:31:34 +0000 (19:31 -0700)
commita1f983174dd7e535e50ca850fcfb3b8d38149f39
treecec8305aa57cdb654b937ec8ef9d542242f62488
parent63a1281b651b8ebc04c829254c62bd6fbaf83eb0
parentc12d2da56d0e07d230968ee2305aaa86b93a6832
Merge branch 'mm-urgent-for-linus' of git://git./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
include/linux/mm.h
mm/gup.c
mm/nommu.c