From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752078AbdHCCmh (ORCPT ); Wed, 2 Aug 2017 22:42:37 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:37660 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751188AbdHCCmf (ORCPT ); Wed, 2 Aug 2017 22:42:35 -0400 Date: Wed, 2 Aug 2017 19:42:31 -0700 From: Stephen Hemminger To: Stephen Rothwell Cc: David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Stephen Hemminger , Florian Fainelli Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170802194231.26a45521@xeon-e3> In-Reply-To: <20170803120137.697ebace@canb.auug.org.au> References: <20170803120137.697ebace@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 On Thu, 3 Aug 2017 12:01:37 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/hyperv/netvsc.c > > between commit: > > 4a0dee1ffe0e ("netvsc: Initialize 64-bit stats seqcount") > > from the net tree and commit: > > 35fbbccfb417 ("netvsc: save pointer to parent netvsc_device in channel table") > > 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. > Thanks, that looks right.