| Message ID | 20231215105219.118a1ea5@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-260-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8929332dys;
Thu, 14 Dec 2023 15:52:53 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IE1jYGpUj4c7wpuG4DgfNbQA04ELwjqlMMqdUTXMohzpENhQnG1HDlxZZc3xYqCxPKUcc0A
X-Received: by 2002:a05:6808:200c:b0:3b9:d7a0:d15d with SMTP id
q12-20020a056808200c00b003b9d7a0d15dmr11872520oiw.89.1702597973219;
Thu, 14 Dec 2023 15:52:53 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702597973; cv=none;
d=google.com; s=arc-20160816;
b=u6DaoF4GvaXyFINNRzBfToF/gnKxqHOsZBRjH1j1TmNEm1KHQKbVJKGCP23qrgeYZw
l0oCxdCFxVdzAmBs3gWVrTVIV/+J3C4Zmftu6pKP8BwTd6FOGKWanza+D0hcXtatFUpM
pNn3IsMTC9Kef30FFuLaCLyju3aR3ngMLPAiUuPLsAUdWiuvMOoO+u3jUKoOsZ7/ORdJ
kgjuuzNbGvkD5q4PYEqeP37E2tcJ/FV/SCR8zLGsotIW/qItMr+7AqzyBF7YCRhEgHdA
1s/LwzIRWMAhTxON4X9SB2gCml81gCdn+lw8E+rfw8x27HWd3kZeH0Xxg+VvtQ5FyEI7
hQcA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=rMQwh6ZcWzINIjfHJVIKMLZyamBUqrB0RFZAYZl7Zb8=;
fh=5apY95wsIkYODAFRzD4seFuK//PMhRExYP+WzYKCKzU=;
b=mqjZ7HtXh7jOeJesUHmbYiGD6Y06MUl0c/T24zAe01supj8KTdXm1+hwqcbPg+vjiZ
Tw0tt+cenphbK6DBjdNDDutJW9Zb+d3/Xpm7SfVP2k6AwTIiF4/ACISviMvagsb0w6B4
XPlAdypVzjex4mtdIZXdUBDEb7b3S/Tonl9IF37/T2V/yy2W2eXylNxT4elYFRDcGtrj
sgJfh/EbwKxhpbLEplV4lfvomIwUzUShZCDgGVj/RhPVgw8CzgbRZMPiEb/nO2RH1pdH
Sx5QUUFljv4KAVNDFBZ96aREF4FfotdlVJ3JD1DnquxdJPCo6JeANllUDMG6c2bvOBRx
IfFg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZKcQ49B5;
spf=pass (google.com: domain of
linux-kernel+bounces-260-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-260-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org.
[2604:1380:45e3:2400::1])
by mx.google.com with ESMTPS id
v19-20020a056a00149300b006cc23e358bcsi12001522pfu.1.2023.12.14.15.52.53
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 14 Dec 2023 15:52:53 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-260-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZKcQ49B5;
spf=pass (google.com: domain of
linux-kernel+bounces-260-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-260-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by sv.mirrors.kernel.org (Postfix) with ESMTPS id 000FE2818A4
for <ouuuleilei@gmail.com>; Thu, 14 Dec 2023 23:52:52 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 0D28F2DB85;
Thu, 14 Dec 2023 23:52:34 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="ZKcQ49B5"
X-Original-To: linux-kernel@vger.kernel.org
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3DCA2DB61;
Thu, 14 Dec 2023 23:52:25 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702597943;
bh=rMQwh6ZcWzINIjfHJVIKMLZyamBUqrB0RFZAYZl7Zb8=;
h=Date:From:To:Cc:Subject:From;
b=ZKcQ49B5I/Jh5muyWnok/xCBnkIK+8G2HMRiJ/im9+jVFpiXFFqrtXu/jKk3N2DTX
4TUt9/t/Lnf1PJbB+FpbZxXMfDr+DOzMJVdmnWbTLR695N/9unuF2c9nmIeSoaXBE8
/Skj2UAjxjnvmq/brgKRxTUuMupW/jirv3w7M4Wa0WOGQ/VaMubkF8HlpfsQnrwkHf
JIxWg8ZMZZOiT8p3Prvs+7HJqPnyyeo8XPNLdfbiQNFBcrz9zGT9xCn9Bq1me0NrhW
ePw6bPUmVnpwcUpIRco6es3qWWws8TBLkjV36ohZuW/p6g3N1LrenzBtO+xD2eLelF
7U4cgLqu0oThg==
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 4Srq0629Nwz4wb2;
Fri, 15 Dec 2023 10:52:21 +1100 (AEDT)
Date: Fri, 15 Dec 2023 10:52:19 +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>, Petr Oros <poros@redhat.com>, Piotr Gardocki
<piotrx.gardocki@intel.com>, Ranganatha Rao <ranganatha.rao@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>
Subject: linux-next: manual merge of the net-next tree with Linus' tree
Message-ID: <20231215105219.118a1ea5@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+IvAp3H7R_mPW8u+BQNbQvZ";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785303372473736950
X-GMAIL-MSGID: 1785303372473736950
|
| Series |
linux-next: manual merge of the net-next tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Dec. 14, 2023, 11:52 p.m. UTC
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/intel/iavf/iavf_ethtool.c
between commit:
3a0b5a2929fd ("iavf: Introduce new state machines for flow director")
from Linus' tree and commit:
95260816b489 ("iavf: use iavf_schedule_aq_request() helper")
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/intel/iavf/iavf_ethtool.c index dc499fe7734e,f147743792fb..000000000000 --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c