From: "Baicar, Tyler" <tbaicar@codeaurora•org>
To: Will Deacon <will.deacon@arm•com>,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Christoph Hellwig <hch@lst•de>,
Catalin Marinas <catalin.marinas@arm•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree
Date: Mon, 19 Jun 2017 13:22:03 -0600 [thread overview]
Message-ID: <2c0228e4-f235-f97b-880a-e331d164b3ce@codeaurora.org> (raw)
In-Reply-To: <afe3af71-36d4-df49-07a9-2e3fba3a5c16@codeaurora.org>
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.
next prev parent reply other threads:[~2017-06-19 19:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 5:21 linux-next: manual merge of the uuid tree with the arm64 tree Stephen Rothwell
2017-06-16 6:09 ` Christoph Hellwig
2017-06-19 0:28 ` Stephen Rothwell
2017-06-19 9:19 ` Will Deacon
2017-06-19 10:06 ` Andy Shevchenko
2017-06-19 10:22 ` Will Deacon
2017-06-19 18:41 ` Baicar, Tyler
2017-06-19 19:22 ` Baicar, Tyler [this message]
2017-06-20 8:40 ` Will Deacon
2017-06-20 8:43 ` Christoph Hellwig
2017-06-20 8:47 ` Andy Shevchenko
2017-06-20 18:13 ` Baicar, Tyler
2017-06-20 18:17 ` Andy Shevchenko
2017-06-20 18:20 ` Will Deacon
2017-06-20 18:26 ` Baicar, Tyler
2017-06-21 9:21 ` Will Deacon
2017-06-21 18:19 ` Baicar, Tyler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c0228e4-f235-f97b-880a-e331d164b3ce@codeaurora.org \
--to=tbaicar@codeaurora$(echo .)org \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox