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

2020-12-15 Thread Stephen Rothwell
Hi all, On Fri, 11 Dec 2020 18:24:53 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > kernel/events/core.c > > between commit: > > 78af4dc949da ("perf: Break deadlock involving exec_update_mutex") > > from the tip tree and commit: > >

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

2018-10-14 Thread Eric W. Biederman
Stephen Rothwell writes: > Hi all, > > On Mon, 15 Oct 2018 15:11:59 +1100 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the userns tree got a conflict in: >> >> arch/x86/mm/fault.c >> >> between commit: >> >> 164477c2331b ("x86/mm: Clarify hardware vs. software "error_code"

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

2018-10-14 Thread Stephen Rothwell
Hi all, On Mon, 15 Oct 2018 15:11:59 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > arch/x86/mm/fault.c > > between commit: > > 164477c2331b ("x86/mm: Clarify hardware vs. software "error_code"") > (and others from that series) > > fr