From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Jun 2017 09:49:12 +0000 (+0900)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~717
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edf9364d3f924aff6f77176b8e52a4b68e5c30d6;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "Two fixlets for x86:

   - Handle WARN_ONs proper with the new UD based WARN implementation

   - Disable 1G mappings when 2M mappings are disabled by kmemleak or
     debug_pagealloc. Otherwise 1G mappings might still be used,
     confusing the debug mechanisms"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Disable 1GB direct mappings when disabling 2MB mappings
  x86/debug: Handle early WARN_ONs proper
---

edf9364d3f924aff6f77176b8e52a4b68e5c30d6