From: "Baicar, Tyler" <tbaicar@codeaurora•org>
To: Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Christoph Hellwig <hch@lst•de>, Will Deacon <will.deacon@arm•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
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: Tue, 20 Jun 2017 12:13:13 -0600 [thread overview]
Message-ID: <25d08c14-eea7-8b58-675a-1124200b50a6@codeaurora.org> (raw)
In-Reply-To: <1497948465.22624.167.camel@linux.intel.com>
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/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.
>>> The conflict in -next came from Christoph's tree:
>>>
>>> http://git.infradead.org/users/hch/uuid.git/heads
>>>
>>> hence why I mentioned the uuid-types branch above. It's not clear to
>>> me
>>> how Andy's branch fits in with this.
>> I think Andy is preparing various uuid conversion in it and wanted to
>> make sure you don't do any work he already did or which conflicts with
>> this work.
> Thanks, Christoph, that's correct.
>
>> For now please just base it on my uuid-types tree.
> Yeah, this is safest option for now.
>
Will,
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 hopefully now avoid
conflicts with any other patch.
Andy,
The patch that was causing compilation failures on your branch was:
22e31da efi: Switch to use new generic UUID API
The failures were because of the removed guid_t * casts. Note that this
patch will conflict with my patch series, so you may want to rebase it
onto linux-next once they are in.
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.
next prev parent reply other threads:[~2017-06-20 18:13 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
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 [this message]
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=25d08c14-eea7-8b58-675a-1124200b50a6@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