From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935054AbcKWXpi (ORCPT ); Wed, 23 Nov 2016 18:45:38 -0500 Received: from ozlabs.org ([103.22.144.67]:52781 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933483AbcKWXph (ORCPT ); Wed, 23 Nov 2016 18:45:37 -0500 Date: Thu, 24 Nov 2016 10:36:06 +1100 From: Stephen Rothwell To: Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Piggin , "Naveen N. Rao" Subject: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree Message-ID: <20161124103606.0333e388@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 all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/include/asm/asm-prototypes.h between commit: 9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations") from the powerpc-fixes tree and commit: 82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.h") from the powerpc 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/powerpc/include/asm/asm-prototypes.h index e0baba1535e6,dfef1174663e..000000000000 --- a/arch/powerpc/include/asm/asm-prototypes.h +++ b/arch/powerpc/include/asm/asm-prototypes.h @@@ -13,12 -13,6 +13,11 @@@ */ #include - #include +#include +#include +#include +#include + #include /* SMP */