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

2019-09-15 Thread Mark Brown
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/ia64/Kconfig between commits: fc5bad03709f9 ("ia64: remove the hpsim platform") cf07cb1ff4ea0 ("ia64: remove support for the SGI SN2 platform") from the ia64 tree and commit: a2cbfd46559e8 ("arch, ia64: Make

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

2017-11-12 Thread Stephen Rothwell
Hi Mark, On Wed, 11 Oct 2017 17:10:35 +0100 Mark Brown wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/s390/include/asm/spinlock.h > > between a series of commits adding wait queuing to s390 spinlocks > from the s390 tree: > >

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

2017-11-12 Thread Stephen Rothwell
Hi Mark, On Wed, 11 Oct 2017 17:10:35 +0100 Mark Brown wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/s390/include/asm/spinlock.h > > between a series of commits adding wait queuing to s390 spinlocks > from the s390 tree: > > eb3b7b848fb3dd00f7a57d633

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

2017-10-12 Thread Mark Brown
On Wed, Oct 11, 2017 at 06:23:29PM +0100, Will Deacon wrote: > On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote: > > I'm don't feel confident I can resolve this conflict sensibly without > > taking too long so I've used the tip tree from yesterday. > It's a shame that the conflict is

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

2017-10-12 Thread Mark Brown
On Wed, Oct 11, 2017 at 06:23:29PM +0100, Will Deacon wrote: > On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote: > > I'm don't feel confident I can resolve this conflict sensibly without > > taking too long so I've used the tip tree from yesterday. > It's a shame that the conflict is

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

2017-10-11 Thread Will Deacon
Hi Mark, On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/s390/include/asm/spinlock.h > > between a series of commits adding wait queuing to s390 spinlocks > from the s390 tree: > >

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

2017-10-11 Thread Will Deacon
Hi Mark, On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/s390/include/asm/spinlock.h > > between a series of commits adding wait queuing to s390 spinlocks > from the s390 tree: > >

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

2017-10-11 Thread Mark Brown
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/include/asm/spinlock.h between a series of commits adding wait queuing to s390 spinlocks from the s390 tree: eb3b7b848fb3dd00f7a57d633 s390/rwlock: introduce rwlock wait queueing b96f7d881ad94203e997cd2aa

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

2017-10-11 Thread Mark Brown
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/s390/include/asm/spinlock.h between a series of commits adding wait queuing to s390 spinlocks from the s390 tree: eb3b7b848fb3dd00f7a57d633 s390/rwlock: introduce rwlock wait queueing b96f7d881ad94203e997cd2aa