Merge tag 'pull-fs_context' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull fs_context updates from Al Viro:
 "Change vfs_parse_fs_string() calling conventions

  Get rid of the length argument (almost all callers pass strlen() of
  the string argument there), add vfs_parse_fs_qstr() for the cases that
  do want separate length"

* tag 'pull-fs_context' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  do_nfs4_mount(): switch to vfs_parse_fs_string()
  change the calling conventions for vfs_parse_fs_string()

diff --cc Documentation/filesystems/porting.rst
index 78c3d07c0c08e98f72e2eab007bf91e62bb2dd6f,ab48ab3f6eb21c8a71daf67d5006ab53823e3dbf..7233b04668fcce75f1ed170329a2cd18110a7d89
--- 1/Documentation/filesystems/porting.rst
--- 2/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1290,10 -1290,10 +1290,22 @@@ parameters for the file system to set t
  
  **mandatory**
  
 +Several functions are renamed:
 +
 +-  kern_path_locked -> start_removing_path
 +-  kern_path_create -> start_creating_path
 +-  user_path_create -> start_creating_user_path
 +-  user_path_locked_at -> start_removing_user_path_at
 +-  done_path_create -> end_creating_path
++
++---
++
++**mandatory**
++
+ Calling conventions for vfs_parse_fs_string() have changed; it does *not*
+ take length anymore (value ? strlen(value) : 0 is used).  If you want
+ a different length, use
+ 
+       vfs_parse_fs_qstr(fc, key, &QSTR_LEN(value, len))
+ 
+ instead.

diff --cc fs/namespace.c
Simple merge

diff --cc fs/nfs/namespace.c
Simple merge

diff --cc include/linux/fs_context.h
Simple merge

diff --cc kernel/trace/trace.c
Simple merge