tree 9c2fffb52276dbbe7ce334e683a3262f699d3d10
parent e10994ff38ded64e4cd2267a6e404a4c8632bcf5
parent 69786cdb379bbc6eab14cf2393c1abd879316e85
author Linus Torvalds <torvalds@linux-foundation.org> 1441073796 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441073796 -0700

Merge branch 'mm-kasan-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/kasan changes from Ingo Molnar:
 "These are two KASAN changes that factor out (and generalize) x86
  specific KASAN code from x86 to mm"

* 'mm-kasan-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
  x86/kasan: Define KASAN_SHADOW_OFFSET per architecture