| Message ID | 20230809145333.03f31309@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2575243vqr;
Tue, 8 Aug 2023 22:22:05 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IHE+DP+2nogRunNXkEJfPKAkEoGAAzK1rMW1aKVqEF1Bd1Ijli7DouTXDjkiW7VwLl1LXO1
X-Received: by 2002:a17:907:2722:b0:992:48b7:99e3 with SMTP id
d2-20020a170907272200b0099248b799e3mr1097425ejl.63.1691558525049;
Tue, 08 Aug 2023 22:22:05 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691558525; cv=none;
d=google.com; s=arc-20160816;
b=SSSDawfa4T6SmugQlfAKThZ7fluENW9XC7WE47dMTV50KKsItAAAwlGv1p9mwANcPI
opxn2/qn2Lb+nLscp4itMGF58NfQU5QhNaEyZGuR6pKqvLZ7Pu6OUdCrTgCmJ9zbLvJU
6tALxLAxRN5u7vN5FeHVRCjHU8zBKF6ktNhPst/RLSlJl3bBvOR0MVR6hHY6nOe7h9Q2
MACrxo3bWpYjMQNhzv7jvVokjL0TtLu4ttBI4yzw1AvxaSIPo2eO5mCm3MDkj7YlfpEb
zp6hy+APfLOTbcliKwZaz/mBm+vnVPLdK7GhZLwqJvcsbVjo14s3n7Ec5QsBH4Ewva9z
lF3w==
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=aLsuRyNueNps0bFQ4pQb+x6W7rQ/5KpaQNJlP45Vnz8=;
fh=MMNzMsQ3oaRaAFixaa6Z1FjegyQEGugS+o6KyStP2Jw=;
b=c2Gq2X68duXxD6vYHNfnQp8QihmuX66F4Zl1SF08j2IgOPSKlQM2yC3sErBhbE/VCk
jS5fl64kD3C2wl5S+k2kOLLASNC02DCTDfVp9O1cQ+EHrNbyC23N0ZPnKS4fLiwXaC+6
eOC+iF52xUjcs7AclBzX5ZGqWM0zVrefBZlfXAC80t8TS/hMHEATule+yXLXM1iAsa2P
3T/H5B22YN/OcPEm2JORVCY/Ib5jyDSsI5wkJnIZyC7GsJmJLSK1Ye2qz882oA50DTwp
lPD3STmwBzFAqbHYTTfTZJmG8mf+he8zVjAo2t6ayc1PWVNRVN6AMurMuIODlj3O6Sgj
ZW/A==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="LGr9OY/j";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
lc26-20020a170906dffa00b009926007b7dasi7797259ejc.126.2023.08.08.22.21.40;
Tue, 08 Aug 2023 22:22:05 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="LGr9OY/j";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229978AbjHIExp (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others);
Wed, 9 Aug 2023 00:53:45 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43726 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229450AbjHIExo (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 9 Aug 2023 00:53:44 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33884172A;
Tue, 8 Aug 2023 21:53:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1691556816;
bh=aLsuRyNueNps0bFQ4pQb+x6W7rQ/5KpaQNJlP45Vnz8=;
h=Date:From:To:Cc:Subject:From;
b=LGr9OY/jEncvFqrh4bN3YngPbbY6UMSB/5i7iiUYiPbvG6+WiNFx+K7CwBw2NE7lp
u9TTY+nix45g9gOnaE6aSEnboMZCbwtxjhKYARtIhHeGmeLHtnbhmOdad8TflI0iWP
elMG5jF+slADeve+tHaiLRvgCfwVG9SSeumz9sOaMpxLVKCbrzNvbzeoj7HGzGuzLW
diWUSHj+rMUGK2/F+rLLDW17hxVoLkEA6DRP1Xp3SVImNVeyjLgq03j3UJwEeCIud4
LE3WQRqX/uAHh5XTYH+j7HJ50ysbubFCoCFUmJFTlyhRDCdKfgDNgvKR4J61NBjK1w
kqyr/aJTQKc/Q==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4RLHkl1q0Mz4wy0;
Wed, 9 Aug 2023 14:53:35 +1000 (AEST)
Date: Wed, 9 Aug 2023 14:53:33 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yury Norov <yury.norov@gmail.com>,
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>,
Maher Sanalla <msanalla@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: linux-next: manual merge of the bitmap tree with the net-next tree
Message-ID: <20230809145333.03f31309@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IJJROMl7gUlfPHMeKnbCfDf";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS,
URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1773727671982256462
X-GMAIL-MSGID: 1773727671982256462
|
| Series |
linux-next: manual merge of the bitmap tree with the net-next tree
|
|
Commit Message
Stephen Rothwell
Aug. 9, 2023, 4:53 a.m. UTC
Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/eq.c
between commits:
54b2cf41b853 ("net/mlx5: Refactor completion IRQ request/release handlers in EQ layer")
ddd2c79da020 ("net/mlx5: Introduce mlx5_cpumask_default_spread")
from the net-next tree and commit:
a4be5fa84bb2 ("net: mlx5: switch comp_irqs_request() to using for_each_numa_cpu")
from the bitmap 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/mellanox/mlx5/core/eq.c index ea0405e0a43f,7c8dc0443d6a..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c