merge v4.20 with wrapfs latest branch

diff --cc MAINTAINERS
index 7ef616ac792087772fb15f7a68687d43154b9726,f3a5c97e34196680db3be6e92db9386155a33b7d..0e8047ca445d233321b09b730636e7af9f1626fc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13422,15 -16354,12 +16354,21 @@@ F:        include/linux/workqueue.
  F:    kernel/workqueue.c
  F:    Documentation/core-api/workqueue.rst
  
 +WRAP FILE SYSTEM
 +M:    Erez Zadok <ezk@cs.sunysb.edu>
 +L:    wrapfs@filesystems.org
 +W:    http://wrapfs.filesystems.org/
 +T:    git git://git.fsl.cs.sunysb.edu/wrapfs-latest.git
 +S:    Maintained
 +F:    Documentation/filesystems/wrapfs.txt
 +F:    fs/wrapfs/
 +
+ X-POWERS AXP288 PMIC DRIVERS
+ M:    Hans de Goede <hdegoede@redhat.com>
+ S:    Maintained
+ N:    axp288
+ F:    drivers/acpi/pmic/intel_pmic_xpower.c
+ 
  X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Chen-Yu Tsai <wens@csie.org>
  L:    linux-kernel@vger.kernel.org

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge

diff --cc include/linux/namei.h
index 2375bc50a9d34e4e21a6d24b3272a1cacba4b7b0,a78606e8e3df7c155410da7a366490354fb9dcb6..fec615f91284dd8286c9708ea1789e2f4d418ac5
--- 1/include/linux/namei.h
--- 2/include/linux/namei.h
+++ b/include/linux/namei.h
@@@ -78,9 -80,8 +80,10 @@@ extern struct dentry *user_path_create(
  extern void done_path_create(struct path *, struct dentry *);
  extern struct dentry *kern_path_locked(const char *, struct path *);
  extern int kern_path_mountpoint(int, const char *, struct path *, unsigned int);
 +extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
 +                         const char *, unsigned int, struct path *);
  
+ extern struct dentry *try_lookup_one_len(const char *, struct dentry *, int);
  extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
  extern struct dentry *lookup_one_len_unlocked(const char *, struct dentry *, int);
  

diff --cc include/uapi/linux/magic.h
Simple merge