From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Oct 2017 10:49:15 +0000 (-0400)
Subject: Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.14-rc5~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be1f16ba35d97aff4d85c0daba0a02da51b7c83c;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch '4.14-fixes' of git://git.linux-mips.org/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
---

be1f16ba35d97aff4d85c0daba0a02da51b7c83c