Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[email protected] Wed, 04 Jul 2018 16:51:14 +0200

Newsgroups	gmane.linux.ports.mips.cvs
Message-ID	<S23994663AbeGDOvSi6-0A/[email protected]>

Author: Ralf Baechle <[email protected]> Wed Jul 4 15:55:30 2018 +0200
Commit: 7de723f763bd038d83148270e0257745ce35b565
Gitweb: https://git.linux-mips.org/g/ralf/linux/7de723f763bd
Branch: master

---

 arch/arm/firmware/Makefile |    3 +++
 fs/userfaultfd.c           |   12 +++++++-----
 mm/debug.c                 |   18 ++++++++++++++++--
 mm/hugetlb.c               |    1 +
 mm/kasan/kasan.c           |    5 +++--
 net/smc/af_smc.c           |    3 ++-
 6 files changed, 32 insertions(+), 10 deletions(-)