From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Feb 2019 01:15:33 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v5.0-rc7~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f947a7a011fcceb14cb912f5481a53b18f1879a;p=thirdparty%2Flinux.git

Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "6 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: proc: smaps_rollup: fix pss_locked calculation
  Rename include/{uapi => }/asm-generic/shmparam.h really
  Revert "mm: use early_pfn_to_nid in page_ext_init"
  mm/gup: fix gup_pmd_range() for dax
  Revert "mm: slowly shrink slabs with a relatively small number of objects"
  Revert "mm: don't reclaim inodes with many attached pages"
---

1f947a7a011fcceb14cb912f5481a53b18f1879a