From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932277AbbJODFQ (ORCPT ); Wed, 14 Oct 2015 23:05:16 -0400 Received: from ozlabs.org ([103.22.144.67]:40359 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103AbbJODFO (ORCPT ); Wed, 14 Oct 2015 23:05:14 -0400 Date: Thu, 15 Oct 2015 14:05:11 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Catalin Marinas Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ard Biesheuvel , Leif Lindholm Subject: linux-next: manual merge of the tip tree with the arm64 tree Message-ID: <20151015140511.0b1e0a2f@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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 Hi all, Today's linux-next merge of the tip tree got a conflict in: Documentation/arm/uefi.txt between commit: d4dddfdbbc75 ("arm64/efi: remove /chosen/linux, uefi-stub-kern-ver DT property") from the arm64 tree and commit: c9494dc81875 ("arm64: Use core efi=debug instead of uefi_debug command line parameter") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc Documentation/arm/uefi.txt index 7f1bed8872f3,7b3fdfe0f7ba..000000000000 --- a/Documentation/arm/uefi.txt +++ b/Documentation/arm/uefi.txt @@@ -58,5 -58,5 +58,3 @@@ linux,uefi-mmap-desc-size | 32-bit | Si -------------------------------------------------------------------------------- linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. -------------------------------------------------------------------------------- - - For verbose debug messages, specify 'uefi_debug' on the kernel command line. -linux,uefi-stub-kern-ver | string | Copy of linux_banner from build. ---------------------------------------------------------------------------------