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

[Stephen Rothwell]

Hi all,

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

  arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

between commit:

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

from the vfs tree and commit:

  a3dbd01e6c9d ("x86/intel_rdt: Create character device exposing pseudo-locked 
region")

from the tip tree.

I fixed it up (I think - 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 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
index 38a54f56ff40,7b4a09d81a30..000000000000
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@@ -1270,9 -1861,16 +1842,15 @@@ static int rdt_get_tree(struct fs_conte
                rdtgroup_default.mon.mon_data_kn = kn_mondata;
        }
  
+       ret = rdt_pseudo_lock_init();
+       if (ret) {
+               dentry = ERR_PTR(ret);
+               goto out_mondata;
+       }
+ 
 -      dentry = kernfs_mount(fs_type, flags, rdt_root,
 -                            RDTGROUP_SUPER_MAGIC, NULL);
 -      if (IS_ERR(dentry))
 +      ret = kernfs_get_tree(fc);
 +      if (ret < 0)
-               goto out_mondata;
+               goto out_psl;
  
        if (rdt_alloc_capable)
                static_branch_enable_cpuslocked(&rdt_alloc_enable_key);

pgpayUC8GD3l_.pgp
Description: OpenPGP digital signature