From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jun 2018 16:56:23 +0000 (-0700)
Subject: Merge tag 'mips_fixes_4.18_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Tag: v4.18-rc3~31
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59ec39fe38264d9f61d9ea2dbe32cb681069b54d;p=users%2Fdwmw2%2Flinux.git

Merge tag 'mips_fixes_4.18_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS build fix from Paul Burton:
 "A single build fix for 4.18:

  Adjust rseq_signal_deliver() & rseq_handle_notify_resume() calls to
  add the ksig argument introduced in v4.18-rc2, around the same time as
  the unadjusted MIPS rseq support"

* tag 'mips_fixes_4.18_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Add ksig argument to rseq_{signal_deliver,handle_notify_resume}
---

59ec39fe38264d9f61d9ea2dbe32cb681069b54d