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

[Thomas Gleixner]

On Thu, 21 Jun 2018, Reinette Chatre wrote:
> I am the contributor of the pseudo-locking related code that caused the
> conflict.
> 
> Stephen, thank you very much for proceeding with the merge and fixing it
> up. I copied your later fix addition to this email and combined they
> look good. I did some basic smoke testing of the merged code and it works.
> 
> Thomas and David, please let me know what I can do from my side to help
> with this.

I'll have a look later today.

> 
> As summary, with the above changes combined the merge can be done using:
> 
> ->8-
> diff --cc arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
> index 7b4a09d81a30,38a54f56ff40..caa2754f8948
> --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
> +++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
> @@@ -1861,16 -1270,9 +1842,13 @@@ 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);
> ++	if (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);
> 
> Reinette
> 
>