Date: Mon, 19 Jun 2017 11:22:41 +0100
From: Will Deacon <will.deacon@arm.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
        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>,
        Tyler Baicar <tbaicar@codeaurora.org>
Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree
Message-ID: <20170619102240.GC2702@arm.com>
References: <20170616152136.161630bf@canb.auug.org.au>
 <20170619091942.GA2702@arm.com>
 <1497866790.22624.164.camel@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1497866790.22624.164.camel@linux.intel.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 755
Lines: 22

On Mon, Jun 19, 2017 at 01:06:30PM +0300, Andy Shevchenko wrote:
> On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote:
> > Hi Stephen, Christoph, Tyler,
> > On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell wrote:
> > > 
> 
> > 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.
> 
> 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?

Will