]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branches 'fixes', 'misc' and 'spectre' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Mon, 13 Aug 2018 15:28:50 +0000 (16:28 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 13 Aug 2018 15:28:50 +0000 (16:28 +0100)
commitc61b466d4f886613c7e71de8282701646a4d999d
treeccb5639773c86cbea94d1c11a133fd23f52a21ca
parentafc9f65e01cd114cb2cedf544d22239116ce0cc6
parent001a30c4d0e871b21d296e1bcafc6756a1b10607
parenta3c0f84765bb429ba0fd23de1c57b5e1591c9389
Merge branches 'fixes', 'misc' and 'spectre' into for-linus

Conflicts:
arch/arm/include/asm/uaccess.h

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
arch/arm/include/asm/assembler.h
arch/arm/include/asm/uaccess.h
arch/arm/kernel/head-nommu.S
arch/arm/kernel/signal.c
arch/arm/kernel/sys_oabi-compat.c
arch/arm/vfp/vfpmodule.c