Subject: linux-next: manual merge of the akpm-current tree with the vfs tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 19 Jun 2018 16:36:32 +1000

Hi all,

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

  kernel/cgroup/cgroup.c

between commit:

  58e4e43911f8 ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")

from the vfs tree and commit:

  dbe8cec5a8a3 ("mm, oom: add cgroup v2 mount option for cgroup-aware OOM killer")

from the akpm-current 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.c
index 33a11d941d11,de25822590d0..000000000000
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@@ -1734,23 -1734,28 +1734,30 @@@ int cgroup_show_path(struct seq_file *s
  	return len;
  }
  
 -static int parse_cgroup_root_flags(char *data, unsigned int *root_flags)
 +static int cgroup2_parse_option(struct fs_context *fc, char *token)
  {
 -	char *token;
 +	struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
  
 -	*root_flags = 0;
 -
 -	if (!data)
 +	if (!strcmp(token, "nsdelegate")) {
 +		ctx->flags |= CGRP_ROOT_NS_DELEGATE;
 +		return 0;
 +	}
++	if (!strcmp(token, "groupoom")) {
++		ctx->flags |= CGRP_GROUP_OOM;
+ 		return 0;
++	}
  
 -	while ((token = strsep(&data, ",")) != NULL) {
 -		if (!strcmp(token, "nsdelegate")) {
 -			*root_flags |= CGRP_ROOT_NS_DELEGATE;
 -			continue;
 -		} else if (!strcmp(token, "groupoom")) {
 -			*root_flags |= CGRP_GROUP_OOM;
 -			continue;
 -		}
 +	return -EINVAL;
 +}
  
 -		pr_err("cgroup2: unknown option \"%s\"\n", token);
 -		return -EINVAL;
 +static int cgroup_show_options(struct seq_file *seq, struct kernfs_root *kf_root)
 +{
- 	if (current->nsproxy->cgroup_ns == &init_cgroup_ns &&
- 	    cgrp_dfl_root.flags & CGRP_ROOT_NS_DELEGATE)
- 		seq_puts(seq, ",nsdelegate");
++	if (current->nsproxy->cgroup_ns == &init_cgroup_ns) {
++		if (cgrp_dfl_root.flags & CGRP_ROOT_NS_DELEGATE)
++			seq_puts(seq, ",nsdelegate");
++		if (cgrp_dfl_root.flags & CGRP_GROUP_OOM)
++			seq_puts(seq, ",groupoom");
+ 	}
 -
  	return 0;
  }