]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Feb 2018 03:18:12 +0000 (19:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Feb 2018 03:18:12 +0000 (19:18 -0800)
commit40b9672a2f071cbf931eb144997a21332bc0a747
tree9ca1d0e049e3163cec7d337e9d4458e7ab2c857f
parentdc1efc3cfaf5e16870a9a7b1b903dcf6e3ef15e8
parentc68070d0408eb2297331a9c9ae538a7bec13fc81
Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/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
arch/powerpc/kvm/book3s_xive.c
arch/riscv/kernel/process.c
arch/riscv/mm/fault.c