From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967457AbdIZDAW (ORCPT ); Mon, 25 Sep 2017 23:00:22 -0400 Received: from ozlabs.org ([103.22.144.67]:38831 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966346AbdIZDAV (ORCPT ); Mon, 25 Sep 2017 23:00:21 -0400 Date: Tue, 26 Sep 2017 13:00:18 +1000 From: Stephen Rothwell To: "Paul E. McKenney" Cc: Linux-Next Mailing List , Linux Kernel Mailing List , "Steven Rostedt (VMware)" Subject: linux-next: manual merge of the rcu tree with Linus' tree Message-ID: <20170926130018.421ed780@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 rcu tree got a conflict in: kernel/rcu/tree.c between commit: 28585a832602 ("rcu: Allow for page faults in NMI handlers") from Linus' tree and commit: 3e2baa988b9c ("rcu: Allow for page faults in NMI handlers") from the rcu tree. I fixed it up (I just used the rcu tree version) 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