From: Will Deacon <will.deacon@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Tyler Baicar <tbaicar@codeaurora.org>
Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree
Date: Mon, 19 Jun 2017 10:19:43 +0100 [thread overview]
Message-ID: <20170619091942.GA2702@arm.com> (raw)
In-Reply-To: <20170616152136.161630bf@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-06-19 9:19 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 [this message]
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
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=20170619091942.GA2702@arm.com \
--to=will.deacon@arm.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=catalin.marinas@arm.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tbaicar@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).