From patchwork Tue May 12 03:30:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1288176 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=M/8EZGHn; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Ljxx0lRmz9sSs for ; Tue, 12 May 2020 13:31:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728852AbgELDa5 (ORCPT ); Mon, 11 May 2020 23:30:57 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:33765 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728708AbgELDa5 (ORCPT ); Mon, 11 May 2020 23:30:57 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49Ljxn2RTMz9sSr; Tue, 12 May 2020 13:30:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1589254254; bh=FphsOl3KgUXiT3QcYA5xL+rsNqjxWWtwhaXiLT+4PTM=; h=Date:From:To:Cc:Subject:From; b=M/8EZGHnX4NjCx2RZE+LjXi4DfcJ70425RYXyichnh+rApAkZ5gO8HLzfEKmkVW44 KAam3iTvT7TVIBSw7zG/CRQ3cVFzAIXsl2fuJhcATC7xhWIsL5LTCz+4IftGrmFC0k BIUdgbrHQEaYv2uDuWWo0z+afBqnp0BpTTjOCQkcvFLfjfJvvj3adi/I07VqkdwjBB /OHSv1w18mwY+3mEulLE07J2WJoxS5VlSa8++ckAi4oZWkpxzzaazqEfmjIeXt50RQ hQXUw4hX3cijerTYcSpLocLWQLdIcYiG8g5+WHzutdCJbNMLSGzkyQSmeEolOxZpBh ncYdPFRNYKFMg== Date: Tue, 12 May 2020 13:30:51 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Luo bin Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20200512133051.7d740613@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c index 992908e6eebf,eef855f11a01..000000000000 --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c diff --cc drivers/net/ethernet/huawei/hinic/hinic_main.c index 63b92f6cc856,3d6569d7bac8..000000000000 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c