Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-21 Thread Baicar, Tyler
On 6/21/2017 3:21 AM, Will Deacon wrote: Hi Tyler, On Tue, Jun 20, 2017 at 12:26:01PM -0600, Baicar, Tyler wrote: On 6/20/2017 12:20 PM, Will Deacon wrote: On Tue, Jun 20, 2017 at 12:13:13PM -0600, Baicar, Tyler wrote: I have sent you the rebased patches. I took Christoph's uuid-types tree an

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-21 Thread Will Deacon
Hi Tyler, On Tue, Jun 20, 2017 at 12:26:01PM -0600, Baicar, Tyler wrote: > On 6/20/2017 12:20 PM, Will Deacon wrote: > >On Tue, Jun 20, 2017 at 12:13:13PM -0600, Baicar, Tyler wrote: > >>I have sent you the rebased patches. I took Christoph's uuid-types tree and > >>added this patch onto it: > >>

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Baicar, Tyler
On 6/20/2017 12:20 PM, Will Deacon wrote: On Tue, Jun 20, 2017 at 12:13:13PM -0600, Baicar, Tyler wrote: I have sent you the rebased patches. I took Christoph's uuid-types tree and added this patch onto it: 7bf130e4a065 ("ACPI/APEI: Handle GSIV and GPIO notification types") And then added my p

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Will Deacon
On Tue, Jun 20, 2017 at 12:13:13PM -0600, Baicar, Tyler wrote: > I have sent you the rebased patches. I took Christoph's uuid-types tree and > added this patch onto it: > > 7bf130e4a065 ("ACPI/APEI: Handle GSIV and GPIO notification types") > > And then added my patches onto that. This will hopef

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Andy Shevchenko
On Tue, 2017-06-20 at 12:13 -0600, Baicar, Tyler wrote: > On 6/20/2017 2:47 AM, Andy Shevchenko wrote: > > On Tue, 2017-06-20 at 10:43 +0200, Christoph Hellwig wrote: > > > > Andy, > > The patch that was causing compilation failures on your branch was: > > 22e31da efi: Switch to use new generic

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Baicar, Tyler
On 6/20/2017 2:47 AM, Andy Shevchenko wrote: On Tue, 2017-06-20 at 10:43 +0200, Christoph Hellwig wrote: On Tue, Jun 20, 2017 at 09:40:08AM +0100, Will Deacon wrote: To have better coordination, please, look at my WIP branch regarding UUID stuff: http://bitbucket.org/andy-shev/linux/branch/topi

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Andy Shevchenko
On Tue, 2017-06-20 at 10:43 +0200, Christoph Hellwig wrote: > On Tue, Jun 20, 2017 at 09:40:08AM +0100, Will Deacon wrote: > > > > > To have better coordination, please, look at my WIP branch > > > > > regarding > > > > > UUID stuff: > > > > > http://bitbucket.org/andy-shev/linux/branch/topic%2Fuui

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Christoph Hellwig
On Tue, Jun 20, 2017 at 09:40:08AM +0100, Will Deacon wrote: > > >>To have better coordination, please, look at my WIP branch regarding > > >>UUID stuff: > > >>http://bitbucket.org/andy-shev/linux/branch/topic%2Fuuid > > >That link doesn't work for me. Is there anything specific Tyler should be > >

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-20 Thread Will Deacon
On Mon, Jun 19, 2017 at 12:41:38PM -0600, Baicar, Tyler wrote: > On 6/19/2017 4:22 AM, Will Deacon wrote: > >On Mon, Jun 19, 2017 at 01:06:30PM +0300, Andy Shevchenko wrote: > >>On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote: > >>>Hi Stephen, Christoph, Tyler, > >>>On Fri, Jun 16, 2017 at 03:

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-19 Thread Baicar, Tyler
On 6/19/2017 12:41 PM, Baicar, Tyler wrote: On 6/19/2017 4:22 AM, Will Deacon wrote: On Mon, Jun 19, 2017 at 01:06:30PM +0300, Andy Shevchenko wrote: On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote: Hi Stephen, Christoph, Tyler, On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell w

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-19 Thread Baicar, Tyler
On 6/19/2017 4:22 AM, Will Deacon wrote: On Mon, Jun 19, 2017 at 01:06:30PM +0300, Andy Shevchenko wrote: On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote: Hi Stephen, Christoph, Tyler, On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell wrote: Apologies for this: I've just dropped t

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-19 Thread Will Deacon
On Mon, Jun 19, 2017 at 01:06:30PM +0300, Andy Shevchenko wrote: > On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote: > > Hi Stephen, Christoph, Tyler, > > On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell wrote: > > > > > > Apologies for this: I've just dropped the offending merge fr

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-19 Thread Andy Shevchenko
On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote: > Hi Stephen, Christoph, Tyler, > On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell wrote: > > > Apologies for this: I've just dropped the offending merge from the > arm64 > tree so you can include the uuid tree in -next again. > > T

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-19 Thread Will Deacon
Hi Stephen, Christoph, Tyler, On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the uuid tree got conflicts in: > > drivers/acpi/apei/ghes.c > include/uapi/linux/uuid.h > > between commits: > > f4dccde3f9b9 ("ras: acpi/apei: cper: add support

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-18 Thread Stephen Rothwell
Hi all, On Fri, 16 Jun 2017 08:09:01 +0200 Christoph Hellwig wrote: > > The uuid-types tree in uuid.git is immutable, please work on top > of that for ACPI - in fact ACPI was on the of trees we explicitly did this > for. So don't sneak any acpi bits in through the arm64 tree. OK, I have moved

Re: linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-15 Thread Christoph Hellwig
The uuid-types tree in uuid.git is immutable, please work on top of that for ACPI - in fact ACPI was on the of trees we explicitly did this for. So don't sneak any acpi bits in through the arm64 tree.

linux-next: manual merge of the uuid tree with the arm64 tree

2017-06-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the uuid tree got conflicts in: drivers/acpi/apei/ghes.c include/uapi/linux/uuid.h between commits: f4dccde3f9b9 ("ras: acpi/apei: cper: add support for generic data v3 structure") 476e4940c251 ("ras: acpi / apei: generate trace event for unrecognize