From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Feb 2016 21:12:27 +0000 (-0800)
Subject: Merge branch 'akpm'(patches from Andrew)
X-Git-Tag: Ubuntu-5.10.0-12.13~13235
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=29f1bf34ed38222372365657b9498af2e3f8c208;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'akpm'(patches from Andrew)

Merge fixes from Andrew Morton:
 "10 fixes"

The lockdep hlist conversion is in the locking tree too, waiting for the
next merge window.  Andrew thought it should go in now.  I'll take it,
since it fixes a real problem and looks trivially correct (famous last
words).

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  arch/x86/Kconfig: CONFIG_X86_UV should depend on CONFIG_EFI
  mm: fix pfn_t vs highmem
  kernel/locking/lockdep.c: convert hash tables to hlists
  mm,thp: fix spellos in describing __HAVE_ARCH_FLUSH_PMD_TLB_RANGE
  mm,thp: khugepaged: call pte flush at the time of collapse
  mm/backing-dev.c: fix error path in wb_init()
  mm, dax: check for pmd_none() after split_huge_pmd()
  vsprintf: kptr_restrict is okay in IRQ when 2
  mm: fix filemap.c kernel doc warning
  ubsan: cosmetic fix to Kconfig text
---

29f1bf34ed38222372365657b9498af2e3f8c208