From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: 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>,
Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree
Date: Mon, 19 Jun 2017 10:28:49 +1000 [thread overview]
Message-ID: <20170619102849.6b4bb740@canb.auug.org.au> (raw)
In-Reply-To: <20170616060901.GA6320@lst.de>
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
next prev parent reply other threads:[~2017-06-19 0:28 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 [this message]
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
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=20170619102849.6b4bb740@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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=tbaicar@codeaurora.org \
--cc=will.deacon@arm.com \
/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