Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051AbdFPGJE (ORCPT ); Fri, 16 Jun 2017 02:09:04 -0400 Received: from verein.lst.de ([213.95.11.211]:41910 "EHLO newverein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983AbdFPGJD (ORCPT ); Fri, 16 Jun 2017 02:09:03 -0400 Date: Fri, 16 Jun 2017 08:09:01 +0200 From: Christoph Hellwig To: Stephen Rothwell Cc: Christoph Hellwig , Catalin Marinas , Linux-Next Mailing List , Linux Kernel Mailing List , Andy Shevchenko , Tyler Baicar , Will Deacon Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree Message-ID: <20170616060901.GA6320@lst.de> References: <20170616152136.161630bf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170616152136.161630bf@canb.auug.org.au> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 203 Lines: 3 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.