From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753152AbdKAVyY (ORCPT ); Wed, 1 Nov 2017 17:54:24 -0400 Received: from ozlabs.org ([103.22.144.67]:39947 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751525AbdKAVyV (ORCPT ); Wed, 1 Nov 2017 17:54:21 -0400 Date: Thu, 2 Nov 2017 08:54:18 +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 the powerpc-fixes tree Message-ID: <20171102085418.3272faac@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 the powerpc-fixes tree and commit: 6773027205ea ("powerpc/mm/radix: Drop unneeded NULL check") 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/mm/tlb-radix.c index d304028641a2,3a07d7a5e2fe..000000000000 --- a/arch/powerpc/mm/tlb-radix.c +++ b/arch/powerpc/mm/tlb-radix.c @@@ -359,8 -359,7 +359,8 @@@ void radix__flush_tlb_collapsed_pmd(str unsigned long pid, end; - pid = mm ? mm->context.id : 0; + pid = mm->context.id; + preempt_disable(); if (unlikely(pid == MMU_NO_CONTEXT)) goto no_context;