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

Groups > linux.kernel > #1668686

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

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

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

csiph-web