From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755074AbcKXCyA (ORCPT ); Wed, 23 Nov 2016 21:54:00 -0500 Received: from ozlabs.org ([103.22.144.67]:52655 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754602AbcKXCx6 (ORCPT ); Wed, 23 Nov 2016 21:53:58 -0500 Date: Thu, 24 Nov 2016 13:53:53 +1100 From: Stephen Rothwell To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Suraj Jitindar Singh Subject: linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree Message-ID: <20161124135353.570f943a@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/mm/pgtable-radix.c between commit: 555c16328ae6 ("powerpc/mm: Correct process and partition table max size") from the powerpc tree and commit: 9d66195807ac ("powerpc/64: Provide functions for accessing POWER9 partition table") from the kvm-ppc-paulus tree. I fixed it up (the latter removed the code modified by the former) 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