From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Mar 2015 22:02:17 +0000 (-0800)
Subject: Merge tag 'metag-fixes-v4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhoga... 
X-Git-Tag: v5.15~16223
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49db1f0ef2df10de1dfd40c8d66e4379d953640f;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'metag-fixes-v4.0-1' of git://git./linux/kernel/git/jhogan/metag

Pull arch/metag fix from James Hogan:
 "This is just a single patch to fix the KSTK_EIP() and KSTK_ESP()
  macros for metag which have always been erronously returning the PC
  and stack pointer of the task's kernel context rather than from its
  user context saved at entry from userland into the kernel, which
  affects the contents of /proc/<pid>/maps and /proc/<pid>/stat"

* tag 'metag-fixes-v4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: Fix KSTK_EIP() and KSTK_ESP() macros
---

49db1f0ef2df10de1dfd40c8d66e4379d953640f