Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753911AbdFSKGg (ORCPT ); Mon, 19 Jun 2017 06:06:36 -0400 Received: from mga03.intel.com ([134.134.136.65]:9064 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbdFSKGf (ORCPT ); Mon, 19 Jun 2017 06:06:35 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,360,1493708400"; d="scan'208";a="869454486" Message-ID: <1497866790.22624.164.camel@linux.intel.com> Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree From: Andy Shevchenko To: Will Deacon , Stephen Rothwell Cc: Christoph Hellwig , Catalin Marinas , Linux-Next Mailing List , Linux Kernel Mailing List , Tyler Baicar Date: Mon, 19 Jun 2017 13:06:30 +0300 In-Reply-To: <20170619091942.GA2702@arm.com> References: <20170616152136.161630bf@canb.auug.org.au> <20170619091942.GA2702@arm.com> 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: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 615 Lines: 20 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 -- Andy Shevchenko Intel Finland Oy