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: Windows password security audit tool. GUI, reports in PDF.

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

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

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.

For now please just base it on my uuid-types tree.