linux-next: manual merge of the vfs tree with the vfs-fixes tree

[Stephen Rothwell]

Hi all,

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

  kernel/cgroup/cgroup-internal.h

between commit:

  61aa329d0762 ("cgroup: saner refcounting for cgroup_root")

from the vfs-fixes tree and commit:

  b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")

from the vfs 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 kernel/cgroup/cgroup-internal.h
index c9a35f09e4b9,ff86943ea1c8..000000000000
--- a/kernel/cgroup/cgroup-internal.h
+++ b/kernel/cgroup/cgroup-internal.h
@@@ -197,12 -213,10 +215,10 @@@ int cgroup_path_ns_locked(struct cgrou
  			  struct cgroup_namespace *ns);
  
  void cgroup_free_root(struct cgroup_root *root);
- void init_cgroup_root(struct cgroup_root *root, struct cgroup_sb_opts *opts);
+ void init_cgroup_root(struct cgroup_fs_context *ctx);
 -int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask, int ref_flags);
 +int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask);
  int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask);
- struct dentry *cgroup_do_mount(struct file_system_type *fs_type, int flags,
- 			       struct cgroup_root *root, unsigned long magic,
- 			       struct cgroup_namespace *ns);
+ int cgroup_do_get_tree(struct fs_context *fc);
  
  int cgroup_migrate_vet_dst(struct cgroup *dst_cgrp);
  void cgroup_migrate_finish(struct cgroup_mgctx *mgctx);

Attachment: pgpNCu5u6nMXw.pgp
Description: OpenPGP digital signature