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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 19 Jun 2017 10:28:49 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christoph Hellwig <hch@....de>
Cc:     Catalin Marinas <catalin.marinas@....com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Tyler Baicar <tbaicar@...eaurora.org>,
        Will Deacon <will.deacon@....com>
Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree

Hi all,

On Fri, 16 Jun 2017 08:09:01 +0200 Christoph Hellwig <hch@....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