Merge tag 'mips_fixes_4.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Feb 2018 22:59:29 +0000 (14:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Feb 2018 22:59:29 +0000 (14:59 -0800)
commit2bd06ce77ce2ce4fd4a4b10cb03b977ee682b3dc
tree83f76f4f19f4a94c1f97ea15a6a6480332326aef
parent13f514bef13ccc574839c624ca7106a92cbd5e3c
parent6ae1756faddefd7494353380ee546dd38c2f97eb
Merge tag 'mips_fixes_4.16_3' of git://git./linux/kernel/git/jhogan/mips

Pull MIPS fix from James Hogan:
 "A single MIPS fix for mismatching struct compat_flock, resulting in
  bus errors starting Firefox on Debian 8 since 4.13"

* tag 'mips_fixes_4.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MIPS: Drop spurious __unused in struct compat_flock