linux-next: manual merge of the workqueues tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the workqueues tree got a conflict in:

  include/linux/fs_context.h

between commit:

  d1d488d81370 ("fs: add vfs_parse_fs_param_source() helper")

from Linus' tree and commit:

  7f5ba4806d3c ("cgroup1: fix leaked context root causing sporadic NULL deref in LTP")

from the workqueues tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/fs_context.h
index e2bc16300c82,5b44b0195a28..000000000000
--- a/include/linux/fs_context.h
+++ b/include/linux/fs_context.h
@@@ -139,8 -139,7 +139,9 @@@ extern int vfs_parse_fs_string(struct f
  extern int generic_parse_monolithic(struct fs_context *fc, void *data);
  extern int vfs_get_tree(struct fs_context *fc);
  extern void put_fs_context(struct fs_context *fc);
 +extern int vfs_parse_fs_param_source(struct fs_context *fc,
 +				     struct fs_parameter *param);
+ extern void fc_drop_locked(struct fs_context *fc);
  
  /*
   * sget() wrappers to be called from the ->get_tree() op.

Attachment: pgpmy_iWXi5bg.pgp
Description: OpenPGP digital signature