Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751128AbdFTIst (ORCPT ); Tue, 20 Jun 2017 04:48:49 -0400 Received: from mga07.intel.com ([134.134.136.100]:42028 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965AbdFTIrt (ORCPT ); Tue, 20 Jun 2017 04:47:49 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,364,1493708400"; d="scan'208";a="276361735" Message-ID: <1497948465.22624.167.camel@linux.intel.com> Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree From: Andy Shevchenko To: Christoph Hellwig , Will Deacon Cc: "Baicar, Tyler" , Stephen Rothwell , Catalin Marinas , Linux-Next Mailing List , Linux Kernel Mailing List Date: Tue, 20 Jun 2017 11:47:45 +0300 In-Reply-To: <20170620084307.GA9703@lst.de> References: <20170616152136.161630bf@canb.auug.org.au> <20170619091942.GA2702@arm.com> <1497866790.22624.164.camel@linux.intel.com> <20170619102240.GC2702@arm.com> <20170620084007.GA30664@arm.com> <20170620084307.GA9703@lst.de> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1319 Lines: 42 On Tue, 2017-06-20 at 10:43 +0200, Christoph Hellwig wrote: > 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. Thanks, Christoph, that's correct. > > For now please just base it on my uuid-types tree. Yeah, this is safest option for now. -- Andy Shevchenko Intel Finland Oy