From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D412C2D0F7 for ; Tue, 12 May 2020 16:47:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63C5E20720 for ; Tue, 12 May 2020 16:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589302054; bh=S74IfW6d9xHjFO1YUG2+zr5LC3F6yhCnZ+RQj+1ctpY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=h3KDCm5f/A5/jgUQF86IqJGL8KZb8/E43hrRCfYd9Y+4EU8MPGhKxjtJZ15KfKP3H enwGvnPw96pottz97pIoACZKDJrPRBqJRSFu6XqPuZxheN44V3Mb6gDOoK1V39seB3 8L5YMTCVTO2bsTQyyPR7/AElMZG+e2BO4OJjTCMo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728777AbgELQre (ORCPT ); Tue, 12 May 2020 12:47:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:43108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726872AbgELQrd (ORCPT ); Tue, 12 May 2020 12:47:33 -0400 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0B67520714; Tue, 12 May 2020 16:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589302053; bh=S74IfW6d9xHjFO1YUG2+zr5LC3F6yhCnZ+RQj+1ctpY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QHcNqwsBaDdmBRULiz4GEMY0cnr7puhD6VuY6ZzWBsRTTGYcFKIpgTirtGW2j2Rd7 fsOC29IJ+xuY80AyPdzNIEeioM21vyRz8K+C9OP1W3eOU5lFax3t5yXm9v8NnoABTx Gl1cE9qUzwWmfOLeIdKaMslbbOaSancVedsMBiMY= Date: Tue, 12 May 2020 09:47:31 -0700 From: Jakub Kicinski To: Stephen Rothwell Cc: David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Luo bin Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20200512094731.346c0d8f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20200512133051.7d740613@canb.auug.org.au> References: <20200512133051.7d740613@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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 12 May 2020 13:30:51 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c > drivers/net/ethernet/huawei/hinic/hinic_main.c > > between commit: > > e8a1b0efd632 ("hinic: fix a bug of ndo_stop") > > from the net tree and commit: > > 7dd29ee12865 ("hinic: add sriov feature support") > > from the net-next tree. > > I fixed it up (I think, 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. I had a feeling this was gonna happen :( Resolution looks correct, thank you! Luo bin, if you want to adjust the timeouts (you had slightly different ones depending on the command in the first version of the fix) - you can follow up with a patch to net-next once Dave merges net into net-next (usually happens every two weeks).