From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751865AbcGRHzv (ORCPT ); Mon, 18 Jul 2016 03:55:51 -0400 Received: from ozlabs.org ([103.22.144.67]:35887 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531AbcGRHzt (ORCPT ); Mon, 18 Jul 2016 03:55:49 -0400 Date: Mon, 18 Jul 2016 17:55:46 +1000 From: Stephen Rothwell To: Alexandre Belloni , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Paul Gortmaker Subject: linux-next: manual merge of the rtc tree with the tip tree Message-ID: <20160718175546.79c66373@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 Alexandre, Today's linux-next merge of the rtc tree got a conflict in: arch/x86/platform/efi/efi_64.c between commit: cc3ae7b0af27 ("x86/platform: Audit and remove any unnecessary uses of module.h") from the tip tree and commit: 5ab788d73832 ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h") from the rtc 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 arch/x86/platform/efi/efi_64.c index 04db6fbce96d,663c282801f3..000000000000 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@@ -24,7 -24,8 +24,8 @@@ #include #include #include -#include +#include + #include #include #include #include