diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-08-13 16:28:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-08-13 16:28:50 +0100 |
| commit | c61b466d4f886613c7e71de8282701646a4d999d (patch) | |
| tree | ccb5639773c86cbea94d1c11a133fd23f52a21ca /arch/arm/include/asm/assembler.h | |
| parent | ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+ (diff) | |
| parent | ARM: 8785/1: use compiler built-ins for ffs and fls (diff) | |
| parent | ARM: spectre-v1: mitigate user accesses (diff) | |
| download | linux-c61b466d4f886613c7e71de8282701646a4d999d.tar.gz linux-c61b466d4f886613c7e71de8282701646a4d999d.zip | |
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>