From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbcF0EX4 (ORCPT ); Mon, 27 Jun 2016 00:23:56 -0400 Received: from ozlabs.org ([103.22.144.67]:45136 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751629AbcF0EXz (ORCPT ); Mon, 27 Jun 2016 00:23:55 -0400 Date: Mon, 27 Jun 2016 14:23:52 +1000 From: Stephen Rothwell To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mahesh Salgaonkar , Daniel Axtens Subject: linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree Message-ID: <20160627142352.2c1ae65b@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 Paul, Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in: arch/powerpc/kernel/traps.c between commit: 42f5b4cacd78 ("powerpc: Introduce asm-prototypes.h") from the powerpc tree and commit: fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt") from the kvm-ppc-paulus 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/kernel/traps.c index f7e2f2e318bd,9ec95daccad9..000000000000 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@@ -60,7 -60,7 +60,8 @@@ #include #include #include +#include + #include #include #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)