| Message ID | 20231211110328.76c925af@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6750644vqy;
Sun, 10 Dec 2023 16:03:45 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IHRRyR8oqDKtix0A7czBf39l6wm/5r+IjySnhcayCi57ChqdcnnoBDakiDvNltk2zxQTdL/
X-Received: by 2002:a05:6e02:13c6:b0:35d:59a2:1291 with SMTP id
v6-20020a056e0213c600b0035d59a21291mr4722740ilj.61.1702253024965;
Sun, 10 Dec 2023 16:03:44 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702253024; cv=none;
d=google.com; s=arc-20160816;
b=lw6cVEUHW3QmBF7sA2FkKoUmNXSKy202cwiEqFqOYQ1F7HUNjORzKCVirv/sN/VC+2
z8K1RZz4wUG5hwz1K0d7X7UXbpwLQH1lKNNXU+RM9HRCHqgqr1I4yws1bpMMJ0JKqP8p
Ke8vExHk+QeiJGp3Rtcyg2/GIxjkyxmWZLJrXUYPVQDIMz9Hz/1+8hg6Ul/OmEqrSGSi
qCpSpE2rn9O/ycnG1NEc2c7ON9r57GMSAT8QZGEk/ckEG2UIow/Lv7Ahf+UC1wyns03M
1v3feUnxYt/KYonv88JcxnnzLA6xrnJSC4TyVwb5FoKWbJ794djieOAqwwtHOx0fXJ1g
kBBA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=Xu2o7UhOz+q82dze+E6Eq5AxrzPlgZYyi0f1QrDEumU=;
fh=FBjMhRHDZZ/+G0M7z1J3VSR3jTHTgCuCqjFK9o70QHM=;
b=VhSZvu4o27tuDkb5XjeANJQi+15leIgYYmJzDlibWcaUenfwIj88+38n+TCGT+O9lU
JC+NXgwKwdf520Nuk962rPENrs6E+1SmIgxbI9D1noIscXlSiO9uHFqLxQ3KzQSA5OaQ
myC/fMjyF7+Mc8dZxlr3GX3VUAosLVZIX13nqI2QYHD6RWcR0VqgGS4pRvWmD5Fa8bQ5
qjCLJm+SZe3mSpss5bTc0RtiZK+bZoM6kOVYTlENObPykl0lFiug9fvoqNiK7+5E3pxN
TBYSAasCbb1uuvNexJkUqXoZDXUnmP2ILDhrYS8W5pBoiQBCzanwZMPj1kHXAlfWcUjj
QMSA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DeHMjPoB;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from pete.vger.email (pete.vger.email. [23.128.96.36])
by mx.google.com with ESMTPS id
a17-20020a170902ee9100b001c77674ea97si5096114pld.423.2023.12.10.16.03.44
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Dec 2023 16:03:44 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DeHMjPoB;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by pete.vger.email (Postfix) with ESMTP id 0D0E3805793C;
Sun, 10 Dec 2023 16:03:42 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230162AbjLKADZ (ORCPT <rfc822;hjfbswb@gmail.com> + 99 others);
Sun, 10 Dec 2023 19:03:25 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45726 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229483AbjLKADY (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 10 Dec 2023 19:03:24 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 482ADEB;
Sun, 10 Dec 2023 16:03:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702253009;
bh=Xu2o7UhOz+q82dze+E6Eq5AxrzPlgZYyi0f1QrDEumU=;
h=Date:From:To:Cc:Subject:From;
b=DeHMjPoBU+KiXQyXjXi6MwL1kybHIfqmMe1QV3kWygyEdfReZQjJwgFbzu5uT6EoO
GISfQEKG8iyVMitdfu/i62Q5v23q92KwuepzdhMzHcgVdiqRyMKhq8DMqILho/J/zn
0v0ZVFvv97V2KRPX3L1N1Arm9WF9cn8pFuaAwW/jftemQWibOf8x54O4FEStOuK1sW
61A/Siq2r04ukHDDAqNq8kri/3F0MR6WAU39w+/jW5s2mD+IvcSiLqF11yTJGqz6xo
sQsbo7Gqxz1n2UV71RJKTA4dGHOFNpHI9LasNvQ5pxbZa/5+cVOaa8YVyWo0san/SD
3wSQjBKL+P8hw==
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 X25519 server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4SpMQm5dQrz4wdC;
Mon, 11 Dec 2023 11:03:28 +1100 (AEDT)
Date: Mon, 11 Dec 2023 11:03:28 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Moshe Shemesh <moshe@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20231211110328.76c925af@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hjS7o5CUo4wh7zjheP.rlT6";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]);
Sun, 10 Dec 2023 16:03:42 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784941501414659178
X-GMAIL-MSGID: 1784941667770362060
|
| Series |
linux-next: manual merge of the net-next tree with the net tree
|
|
Commit Message
Stephen Rothwell
Dec. 11, 2023, 12:03 a.m. UTC
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
between commit:
3d7a3f2612d7 ("net/mlx5: Nack sync reset request when HotPlug is enabled")
from the net tree and commit:
cecf44ea1a1f ("net/mlx5: Allow sync reset flow when BF MGT interface device is present")
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.
diff --cc drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c index c4e19d627da2,4b8cb120362b..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c