Messages in this thread | | | Date | Fri, 22 Jun 2018 11:56:54 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the tip tree with the vfs tree |
| |
Hi all,
On Fri, 22 Jun 2018 11:53:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > 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);
Actually I have removed the above line as well.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |