diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 20:31:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 20:31:05 +0100 |
commit | 0bd2afc74808389591894dd7c7c83952006a1283 (patch) | |
tree | 087fce24a3f1616a61ac53b5d3ca2225a477a260 /arch/riscv/include/asm/ftrace.h | |
parent | Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan... (diff) | |
parent | MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS (diff) | |
download | linux-0bd2afc74808389591894dd7c7c83952006a1283.tar.xz linux-0bd2afc74808389591894dd7c7c83952006a1283.zip |
Merge tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
Pull MIPS fixes from James Hogan:
"A couple of MIPS fixes for 4.16-rc1, including an important regression
in 4.15 and a rather more longstanding corner case build fix.
These are separate from the main pull request as one of the bugs fixed
was only recently introduced in v4.15-rc8.
- Fix CPS regression on older binutils due to MIPS_ISA_LEVEL_RAW fix
(4.15)
- Fix allmodconfig + CONFIG_MACH_TX49XX=y builds due to incorrect use
of IS_ENABLED() (2.6.28)"
* tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS
MIPS: CPS: Fix MIPS_ISA_LEVEL_RAW fallout
Diffstat (limited to 'arch/riscv/include/asm/ftrace.h')
0 files changed, 0 insertions, 0 deletions