From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753057AbdHWBbN (ORCPT ); Tue, 22 Aug 2017 21:31:13 -0400 Received: from ozlabs.org ([103.22.144.67]:46675 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752810AbdHWBbJ (ORCPT ); Tue, 22 Aug 2017 21:31:09 -0400 Date: Wed, 23 Aug 2017 11:31:05 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Wei Wang , Ido Schimmel , iri Pirko Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170823113105.0bd692ea@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 net-next tree got a conflict in: net/ipv6/ip6_fib.c between commit: c5cff8561d2d ("ipv6: add rcu grace period before freeing fib6_node") from the net tree and commit: a460aa83963b ("ipv6: fib: Add helpers to hold / drop a reference on rt6_info") from the net-next 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 net/ipv6/ip6_fib.c index a5ebf86f6be8,549aacc3cb2c..000000000000 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@@ -160,12 -154,7 +161,12 @@@ static void node_free_rcu(struct rcu_he kmem_cache_free(fib6_node_kmem, fn); } +static void node_free(struct fib6_node *fn) +{ + call_rcu(&fn->rcu, node_free_rcu); +} + - static void rt6_free_pcpu(struct rt6_info *non_pcpu_rt) + void rt6_free_pcpu(struct rt6_info *non_pcpu_rt) { int cpu;