From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Feb 2018 03:18:12 +0000 (-0800)
Subject: Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=40b9672a2f071cbf931eb144997a21332bc0a747;p=linux.git

Merge branch 'work.whack-a-mole' of git://git./linux/kernel/git/viro/vfs

Pull asm/uaccess.h whack-a-mole from Al Viro:
 "It's linux/uaccess.h, damnit... Oh, well - eventually they'll stop
  cropping up..."

* 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  asm-prototypes.h: use linux/uaccess.h, not asm/uaccess.h
  riscv: use linux/uaccess.h, not asm/uaccess.h...
  ppc: for put_user() pull linux/uaccess.h, not asm/uaccess.h
---

40b9672a2f071cbf931eb144997a21332bc0a747