From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Apr 2017 08:42:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v4.14-rc1~1166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b65bb57d87a66cd156f856f28f2bd72d7b2395e;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Several fixes here, mostly having to due with either build errors or
  memory corruptions depending upon whether you have THP enabled or not"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: remove unused wp_works_ok macro
  sparc32: Export vac_cache_size to fix build error
  sparc64: Fix memory corruption when THP is enabled
  sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
  arch/sparc: Avoid DCTI Couples
  sparc64: kern_addr_valid regression
  sparc64: Add support for 2G hugepages
  sparc64: Fix size check in huge_pte_alloc
---

8b65bb57d87a66cd156f856f28f2bd72d7b2395e