Received-SPF: pass (google.com: domain of linux-kernel+bounces-260-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
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
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+IvAp3H7R_mPW8u+BQNbQvZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/+IvAp3H7R_mPW8u+BQNbQvZ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index dc499fe7734e,f147743792fb..000000000000
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@@ -1436,16 -1435,11 +1435,16 @@@ static int iavf_add_fdir_ethtool(struc
  	spin_lock_bh(&adapter->fdir_fltr_lock);
  	iavf_fdir_list_add_fltr(adapter, fltr);
  	adapter->fdir_active_fltr++;
 -	fltr->state =3D IAVF_FDIR_FLTR_ADD_REQUEST;
 +	if (adapter->link_up) {
 +		fltr->state =3D IAVF_FDIR_FLTR_ADD_REQUEST;
- 		adapter->aq_required |=3D IAVF_FLAG_AQ_ADD_FDIR_FILTER;
 +	} else {
 +		fltr->state =3D IAVF_FDIR_FLTR_INACTIVE;
 +	}
  	spin_unlock_bh(&adapter->fdir_fltr_lock);
 =20
 -	iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER);
 +	if (adapter->link_up)
- 		mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
++		iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER);
+=20
  ret:
  	if (err && fltr)
  		kfree(fltr);
@@@ -1475,12 -1469,6 +1474,11 @@@ static int iavf_del_fdir_ethtool(struc
  	if (fltr) {
  		if (fltr->state =3D=3D IAVF_FDIR_FLTR_ACTIVE) {
  			fltr->state =3D IAVF_FDIR_FLTR_DEL_REQUEST;
- 			adapter->aq_required |=3D IAVF_FLAG_AQ_DEL_FDIR_FILTER;
 +		} else if (fltr->state =3D=3D IAVF_FDIR_FLTR_INACTIVE) {
 +			list_del(&fltr->list);
 +			kfree(fltr);
 +			adapter->fdir_active_fltr--;
 +			fltr =3D NULL;
  		} else {
  			err =3D -EBUSY;
  		}

--Sig_/+IvAp3H7R_mPW8u+BQNbQvZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV7lTMACgkQAVBC80lX
0Gy/mAgApKLj8MZ8Tj4vPsNMSJX4ZEnZKrPuG7GFI8vxQRBnWX7UTGKp7/VgExSD
CaAi0PlBXduMSpPe48YimsvLKDEfDqVJiUMEcmh8FoA1rt5aBxuuxrGT3CcWP4JH
bmq1IOR77r4WGzszSyYzeJyHj7Fc9JcTlNE7L5p1/P47fxplVktF3vEN8NRj3XqY
COokn62mquj7YdCXwHBdWmLk+0yMBa13JYCcwxefLHF4inq2ZGxZh+iVOHrKFy0f
YvdHi/c9hKWqL8PUcIWpEGDYgwk1qT6HSxZIu0s7TAY8JjnRuiFvAL3E3zLXHsGX
IQRK6xKacRJgH8gZUzjfYuC97ujGow==
=Przn
-----END PGP SIGNATURE-----

--Sig_/+IvAp3H7R_mPW8u+BQNbQvZ--