From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752592AbdCTACX (ORCPT ); Sun, 19 Mar 2017 20:02:23 -0400 Received: from ozlabs.org ([103.22.144.67]:49433 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752223AbdCTACV (ORCPT ); Sun, 19 Mar 2017 20:02:21 -0400 Date: Mon, 20 Mar 2017 11:02:00 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, stephen hemminger , Stephen Hemminger Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170320110200.239425f5@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: drivers/net/hyperv/netvsc.c between commit: e14b4db7a567 ("netvsc: fix race during initialization") from the net tree and commits: 0d6dd35784e7 ("netvsc: need napi scheduled during removal") 6de38af611ca ("netvsc: avoid race with callback") from the net-next tree. I fixed it up (I just used the net-next 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. P.S. the Signed-off-bys do not match the Author email addresses. -- Cheers, Stephen Rothwell