diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 06:49:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 06:49:15 -0400 |
| commit | be1f16ba35d97aff4d85c0daba0a02da51b7c83c (patch) | |
| tree | d56c1d021313e24973b828c8a112ae3da1878b56 /Makefile | |
| parent | 9aa0d2dde6ebd14e9d16e28081a24721d5b41cc8 (diff) | |
| parent | ca8eb05b5f332a9e1ab3e2ece498d49f4d683470 (diff) | |
Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"More MIPS fixes for 4.14:
- Loongson 1: Set the default number of RX and TX queues to
accomodate for recent changes of stmmac driver.
- BPF: Fix uninitialised target compiler error.
- Fix cmpxchg on 32 bit signed ints for 64 bit kernels with
!kernel_uses_llsc
- Fix generic-board-config.sh for builds using O=
- Remove pr_err() calls from fpu_emu() for a case which is not a
kernel error"
* '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: math-emu: Remove pr_err() calls from fpu_emu()
MIPS: Fix generic-board-config.sh for builds using O=
MIPS: Fix cmpxchg on 32b signed ints for 64b kernel with !kernel_uses_llsc
MIPS: loongson1: set default number of rx and tx queues for stmmac
MIPS: bpf: Fix uninitialised target compiler error
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions