From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753280AbdHWFlS (ORCPT ); Wed, 23 Aug 2017 01:41:18 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36183 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbdHWFlQ (ORCPT ); Wed, 23 Aug 2017 01:41:16 -0400 X-ME-Sender: X-Sasl-enc: uPrSFTH/QbAF94OImovwI07XDb/oR0UIgKBmvxBdO+5k 1503466875 Date: Wed, 23 Aug 2017 08:41:13 +0300 From: Ido Schimmel To: Stephen Rothwell Cc: David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Wei Wang , Ido Schimmel , iri Pirko Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170823054113.GA5342@shredder> References: <20170823113105.0bd692ea@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170823113105.0bd692ea@canb.auug.org.au> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 23, 2017 at 11:31:05AM +1000, Stephen Rothwell wrote: > 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. Looks good to me. Thanks!