From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753057AbcD2GMw (ORCPT ); Fri, 29 Apr 2016 02:12:52 -0400 Received: from ozlabs.org ([103.22.144.67]:48376 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753005AbcD2GMu (ORCPT ); Fri, 29 Apr 2016 02:12:50 -0400 Date: Fri, 29 Apr 2016 16:12:48 +1000 From: Stephen Rothwell To: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Matt Fleming , Ard Biesheuvel Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20160429161248.7e17f45b@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 Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/efi.h between commit: 2c23b73c2d02 ("Ard Biesheuvel ") from the tip tree and commit: 9f2c36a7b097 ("include/linux/efi.h: redefine type, constant, macro from generic code") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/efi.h index aa36fb8bea4b,5b1d5c5b4080..000000000000 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@@ -21,7 -21,7 +21,8 @@@ #include #include #include +#include + #include #include