From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755615AbdKGWc2 (ORCPT ); Tue, 7 Nov 2017 17:32:28 -0500 Received: from ozlabs.org ([103.22.144.67]:48467 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843AbdKGWc1 (ORCPT ); Tue, 7 Nov 2017 17:32:27 -0500 Date: Wed, 8 Nov 2017 09:32:24 +1100 From: Stephen Rothwell To: Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Nicholas Piggin Subject: linux-next: manual merge of the powerpc tree with Linus' tree Message-ID: <20171108093224.54fb4bb0@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/mm/tlb-radix.c between commit: 26e53d5ebe2e ("powerpc/64s/radix: Fix preempt imbalance in TLB flush") from Linus' tree and commit: dffe8449c5dd ("powerpc/64s/radix: Improve preempt handling in TLB code") from the powerpc tree. I fixed it up (I effectively dropped the former as it seems to be fixed in the latter as well) 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