From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Sep 2017 16:50:26 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5e3b19d8165c2af2afee313c9b40eee55cf27a55;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "The two indirect syscall fixes have sat in linux-next for a few days.
  I did check back with a hardware designer to ensure a SYNC is really
  what's required for the GIC fix and so the GIC fix didn't make it into
  to linux-next in time for this final pull request.

  It builds in local build tests and passes Imagination's test system"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  irqchip: mips-gic: SYNC after enabling GIC region
  MIPS: Remove pt_regs adjustments in indirect syscall handler
  MIPS: seccomp: Fix indirect syscall args
---

5e3b19d8165c2af2afee313c9b40eee55cf27a55