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

Hi all, On Sun, 24 Jul 2016 15:13:42 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/sh/include/asm/spinlock.h > > between commit: > > 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction") > > from

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

Hi all, On Sun, 24 Jul 2016 15:13:42 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/sh/include/asm/spinlock.h > > between commit: > > 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction") > > from the sh tree and commit:

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

Hi Rich, On Sun, 24 Jul 2016 23:55:03 -0400 Rich Felker wrote: > > On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > arch/sh/include/asm/spinlock.h > > > > between commit: > > > >

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

Hi Rich, On Sun, 24 Jul 2016 23:55:03 -0400 Rich Felker wrote: > > On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > arch/sh/include/asm/spinlock.h > > > > between commit: > > > > 2da83dfce7df

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

On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/sh/include/asm/spinlock.h > > between commit: > > 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction") > > from the sh tree and

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

On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/sh/include/asm/spinlock.h > > between commit: > > 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction") > > from the sh tree and

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

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/sh/include/asm/spinlock.h between commit: 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction") from the sh tree and commit: 726328d92a42 ("locking/spinlock, arch: Update and fix spin_unlock_wait()

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

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/sh/include/asm/spinlock.h between commit: 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction") from the sh tree and commit: 726328d92a42 ("locking/spinlock, arch: Update and fix spin_unlock_wait()