Re: Trial of conflict resolution of Alan's patch

2018-02-16 Thread Paul E. McKenney
On Fri, Feb 16, 2018 at 04:47:04PM +0100, Andrea Parri wrote: > On Fri, Feb 16, 2018 at 10:18:34AM -0500, Alan Stern wrote: > > On Fri, 16 Feb 2018, Akira Yokosawa wrote: > > > > > Hi, > > > > > > My forward-port patch doesn't apply to the "lkmm" branch. > > > It looks like "linux-kernel-hardware

Re: Trial of conflict resolution of Alan's patch

2018-02-16 Thread Andrea Parri
On Fri, Feb 16, 2018 at 10:18:34AM -0500, Alan Stern wrote: > On Fri, 16 Feb 2018, Akira Yokosawa wrote: > > > Hi, > > > > My forward-port patch doesn't apply to the "lkmm" branch. > > It looks like "linux-kernel-hardware.cat" is intentionally omitted there. > > Am I guessing right? > > > > If t

Re: Trial of conflict resolution of Alan's patch

2018-02-16 Thread Alan Stern
On Fri, 16 Feb 2018, Akira Yokosawa wrote: > Hi, > > My forward-port patch doesn't apply to the "lkmm" branch. > It looks like "linux-kernel-hardware.cat" is intentionally omitted there. > Am I guessing right? > > If this is the case, I can prepare a patch to be applied to "lkmm". > But I can't

Re: Trial of conflict resolution of Alan's patch

2018-02-15 Thread Paul E. McKenney
On Thu, Feb 15, 2018 at 11:05:39PM +0100, Andrea Parri wrote: > On Thu, Feb 15, 2018 at 11:29:14AM -0800, Paul E. McKenney wrote: > > On Thu, Feb 15, 2018 at 12:51:56PM -0500, Alan Stern wrote: > > > On Fri, 16 Feb 2018, Akira Yokosawa wrote: > > > > > > > So, I attempted to rebase the patch to cu

Re: Trial of conflict resolution of Alan's patch

2018-02-15 Thread Andrea Parri
On Thu, Feb 15, 2018 at 11:29:14AM -0800, Paul E. McKenney wrote: > On Thu, Feb 15, 2018 at 12:51:56PM -0500, Alan Stern wrote: > > On Fri, 16 Feb 2018, Akira Yokosawa wrote: > > > > > So, I attempted to rebase the patch to current (somewhat old) master of > > > https://github.com/aparri/memory-mo

Re: Trial of conflict resolution of Alan's patch

2018-02-15 Thread Akira Yokosawa
On 2018/02/15 11:29:14 -0800, Paul E. McKenney wrote: > On Thu, Feb 15, 2018 at 12:51:56PM -0500, Alan Stern wrote: >> On Fri, 16 Feb 2018, Akira Yokosawa wrote: >> >>> So, I attempted to rebase the patch to current (somewhat old) master of >>> https://github.com/aparri/memory-model. Why? Because t

Re: Trial of conflict resolution of Alan's patch

2018-02-15 Thread Paul E. McKenney
On Thu, Feb 15, 2018 at 12:51:56PM -0500, Alan Stern wrote: > On Fri, 16 Feb 2018, Akira Yokosawa wrote: > > > So, I attempted to rebase the patch to current (somewhat old) master of > > https://github.com/aparri/memory-model. Why? Because the lkmm branch > > in Paul's -rcu tree doesn't have linux

Re: Trial of conflict resolution of Alan's patch

2018-02-15 Thread Alan Stern
On Fri, 16 Feb 2018, Akira Yokosawa wrote: > So, I attempted to rebase the patch to current (somewhat old) master of > https://github.com/aparri/memory-model. Why? Because the lkmm branch > in Paul's -rcu tree doesn't have linux-kernel-hardware.cat. > > However, after this change, Z6.0+pooncelock