From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Jan 2016 21:20:54 +0000 (-0800)
Subject: Merge branch 'parisc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.14-rc1~3995
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4eff16c54886c11972d6396ce8447b99e097343;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'parisc-4.5-1' of git://git./linux/kernel/git/deller/parisc-linux

Pull parsic updates from Helge Deller:
 "This patchset includes two major fixes which are both scheduled for
  stable:

  First, __ARCH_SI_PREAMBLE_SIZE was defined with a wrong value.
  Second, huge page pte and TLB changes needed protection with a
  spinlock.  Other than that there are just some trivial optimizations
  and cleanups"

* 'parisc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Protect huge page pte changes with spinlocks
  parisc: Imporove debug info about space registers and TLB configuration
  parisc: Drop parisc-specific NSIGTRAP define
  parisc: Fix __ARCH_SI_PREAMBLE_SIZE
  parisc: Reduce overhead of parisc_requires_coherency()
  parisc: Initialize PCI bridge cache line and default latency
---

a4eff16c54886c11972d6396ce8447b99e097343