Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1667425 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the uuid tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-16 07:30 +0200
    Re: linux-next: manual merge of the uuid tree with the arm64 tree Christoph Hellwig <hch@lst.de> - 2017-06-16 08:10 +0200
      Re: linux-next: manual merge of the uuid tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-19 02:30 +0200
    Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-19 11:20 +0200
      Re: linux-next: manual merge of the uuid tree with the arm64 tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-06-19 12:10 +0200
        Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-19 12:30 +0200
          Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-19 20:50 +0200
            Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-19 21:30 +0200

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

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 unrecognized CPER section")
  8a0456ea3dec ("trace, ras: add ARM processor error trace event")

from the arm64 tree and commit:

  60927bc31436 ("uuid: remove uuid_be defintions from the uapi header")
  f9727a17db9b ("uuid: rename uuid types")
  5b53696a30d5 ("ACPI / APEI: Switch to use new generic UUID API")

from the uuid tree.

I really can't fix this up, so can you guys get together and sort this
out, please.

For today, I have just dropped the uuid tree, sorry.



-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]

#1667435

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.

[toc] | [prev] | [next] | [standalone]

#1668686

Hi all,

On Fri, 16 Jun 2017 08:09:01 +0200 Christoph Hellwig <hch@lst.de> 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 the merging of the uuid tree to very early so the
conflicts against the arm64 tree appear when I merge the arm64 tree.
For today, I have merged the arm64 tree from next-20170615 (head commit
c484f2564db1 "arm64: kconfig: allow support for memory failure
handling").

-- 
Cheers,
Stephen Rothwell

[toc] | [prev] | [next] | [standalone]

#1668919

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 for generic data v3 structure")
>   476e4940c251 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
>   8a0456ea3dec ("trace, ras: add ARM processor error trace event")
> 
> from the arm64 tree and commit:
> 
>   60927bc31436 ("uuid: remove uuid_be defintions from the uapi header")
>   f9727a17db9b ("uuid: rename uuid types")
>   5b53696a30d5 ("ACPI / APEI: Switch to use new generic UUID API")
> 
> from the uuid tree.
> 
> I really can't fix this up, so can you guys get together and sort this
> out, please.
> 
> For today, I have just dropped the uuid tree, sorry.

Apologies for this: I've just dropped the offending merge from the arm64
tree so you can include the uuid tree in -next again.

Tyler: please rebase your patches on top of Christoph's uuid-types branch
and send me a new series.

Will

[toc] | [prev] | [next] | [standalone]

#1668956

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.
> 
> Tyler: please rebase your patches on top of Christoph's uuid-types
> branch
> and send me a new series.

To have better coordination, please, look at my WIP branch regarding
UUID stuff:
http://bitbucket.org/andy-shev/linux/branch/topic%2Fuuid

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

[toc] | [prev] | [next] | [standalone]

#1668985

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 from the
> > arm64
> > tree so you can include the uuid tree in -next again.
> > 
> > Tyler: please rebase your patches on top of Christoph's uuid-types
> > branch
> > and send me a new series.
> 
> 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
paying attention to on that branch?

Will

[toc] | [prev] | [next] | [standalone]

#1669666

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 the offending merge from the
>>> arm64
>>> tree so you can include the uuid tree in -next again.
>>>
>>> Tyler: please rebase your patches on top of Christoph's uuid-types
>>> branch
>>> and send me a new series.
>> 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
> paying attention to on that branch?
That link doesn't work for me either, but I assume it is the topic/uuid 
branch here:

https://bitbucket.org/andy-shev/linux/branches/

I'll rebase my patches on top of this branch and send them to you Will.

Thanks,
Tyler

-- 
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.

[toc] | [prev] | [next] | [standalone]

#1669799

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 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.
>>>>
>>>> Tyler: please rebase your patches on top of Christoph's uuid-types
>>>> branch
>>>> and send me a new series.
>>> 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
>> paying attention to on that branch?
> That link doesn't work for me either, but I assume it is the 
> topic/uuid branch here:
>
> https://bitbucket.org/andy-shev/linux/branches/
>
> I'll rebase my patches on top of this branch and send them to you Will.
I'm trying to rebase my patches; however, this branch does not compile 
as is. It seems that the UUID changes in the APEI code are wrong:

drivers/acpi/apei/ghes.c: In function 'ghes_do_proc':
drivers/acpi/apei/ghes.c:438:12: error: assignment from incompatible 
pointer type [-Werror=incompatible-pointer-types]
    sec_type = gdata->section_type;
             ^
I am just trying to compile the tip code in the topic/uuid branch from 
above. Tip commit is currently:

commit ab4ea80ef9dc97878d60a4a3487fe9dacd0e6b3a
Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date:   Fri Apr 21 16:36:06 2017 +0300

     ASoC: Intel: Skylake: Use recently introduced uuid_le_cmp_p{p}()

-- 
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web