From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Feb 2018 19:31:05 +0000 (-0800)
Subject: Merge tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0bd2afc74808389591894dd7c7c83952006a1283;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'mips_fixes_4.16_1' of git://git./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
---

0bd2afc74808389591894dd7c7c83952006a1283