Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751812AbdFPFVk (ORCPT ); Fri, 16 Jun 2017 01:21:40 -0400 Received: from ozlabs.org ([103.22.144.67]:53535 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750827AbdFPFVj (ORCPT ); Fri, 16 Jun 2017 01:21:39 -0400 Date: Fri, 16 Jun 2017 15:21:36 +1000 From: Stephen Rothwell To: Christoph Hellwig , Catalin Marinas Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Andy Shevchenko , Tyler Baicar , Will Deacon Subject: linux-next: manual merge of the uuid tree with the arm64 tree Message-ID: <20170616152136.161630bf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 790 Lines: 31 Hi all, Today's linux-next merge of the uuid tree got conflicts in: drivers/acpi/apei/ghes.c include/uapi/linux/uuid.h between commits: f4dccde3f9b9 ("ras: acpi/apei: cper: add support for generic data v3 structure") 476e4940c251 ("ras: acpi / apei: generate trace event for unrecognized CPER section") 8a0456ea3dec ("trace, ras: add ARM processor error trace event") from the arm64 tree and commit: 60927bc31436 ("uuid: remove uuid_be defintions from the uapi header") f9727a17db9b ("uuid: rename uuid types") 5b53696a30d5 ("ACPI / APEI: Switch to use new generic UUID API") from the uuid tree. I really can't fix this up, so can you guys get together and sort this out, please. For today, I have just dropped the uuid tree, sorry. -- Cheers, Stephen Rothwell