From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751964AbdHVENi (ORCPT ); Tue, 22 Aug 2017 00:13:38 -0400 Received: from ozlabs.org ([103.22.144.67]:51535 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136AbdHVENN (ORCPT ); Tue, 22 Aug 2017 00:13:13 -0400 Date: Tue, 22 Aug 2017 14:13:11 +1000 From: Stephen Rothwell To: "Paul E. McKenney" , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mathieu Desnoyers , Andy Lutomirski Subject: linux-next: manual merge of the rcu tree with the tip tree Message-ID: <20170822141311.6a99b1f6@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 rcu tree got a conflict in: arch/x86/mm/tlb.c between commit: 94b1b03b519b ("x86/mm: Rework lazy TLB mode and TLB freshness tracking") from the tip tree and commit: 3ed668659e95 ("membarrier: Document scheduler barrier requirements") from the rcu tree. I am pretty sure I have reported this before ... but the latter commit has been rebased. I fixed it up (I again just dropped the additional commit in switch_mm_irqs_off()) 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