From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2015 20:06:06 +0000 (-0700)
Subject: Merge branch 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4b470f120817a16ea28da6141ea6e3a3040b297b;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'parisc-4.1-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "One important patch which fixes crashes due to stack randomization on
  architectures where the stack grows upwards (currently parisc and
  metag only).

  This bug went unnoticed on parisc since kernel 3.14 where the flexible
  mmap memory layout support was added by commit 9dabf60dc4ab.  The
  changes in fs/exec.c are inside an #ifdef CONFIG_STACK_GROWSUP section
  and will not affect other platforms.

  The other two patches rename args of the kthread_arg() function and
  fixes a printk output"

* 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures
  parisc: copy_thread(): rename 'arg' argument to 'kthread_arg'
  parisc: %pf is only for function pointers
---

4b470f120817a16ea28da6141ea6e3a3040b297b