Received-SPF: pass (google.com: domain of linux-wireless+bounces-8334-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Fri, 31 May 2024 12:44:15 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>, Johannes Berg <johannes@sipsolutions.net>
Cc: Wireless <linux-wireless@vger.kernel.org>, Aditya Kumar Singh
 <quic_adisi@quicinc.com>, Johannes Berg <johannes.berg@intel.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20240531124415.05b25e7a@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/e8WJ.=ctS7b1q7BH3npLeZH";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/e8WJ.=ctS7b1q7BH3npLeZH
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/cfg.c

between commit:

  8ecc4d7a7cd3 ("wifi: mac80211: pass proper link id for channel switch sta=
rted notification")

from the wireless tree and commit:

  344d18cec231 ("wifi: mac80211: collect some CSA data into sub-structs")

from the wireless-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 net/mac80211/cfg.c
index 83ad6c9709fe,62119e957cd8..000000000000
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -4028,7 -4028,7 +4029,7 @@@ __ieee80211_channel_switch(struct wiph
  	}
 =20
  	cfg80211_ch_switch_started_notify(sdata->dev,
- 					  &link_data->csa_chanreq.oper, link_id,
 -					  &link_data->csa.chanreq.oper, 0,
++					  &link_data->csa.chanreq.oper, link_id,
  					  params->count, params->block_tx);
 =20
  	if (changed) {

--Sig_/e8WJ.=ctS7b1q7BH3npLeZH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZZOX8ACgkQAVBC80lX
0GyP5gf7BCjJnkS0kwsZ+SARJZQmoABPkxmaBd/FTavGeL48R7KDEXrnaVnyb7+S
Kgv6+hE9NtRw8hln1NxKWHrGhj6ded7WCpBpzSk9XUmeDjtLKWauYRLzW8rWsbw1
aVwJG5EwktUgJtuviRVMLXhDLuTjV69KMvn/0ggoCZTcPt8AXH2uDZbO4TEnPw+i
NHKGB2ghbL1cQpiX9I6OPffqTnRtPACP3Jivzz0PEb8rrSO3i3y/HbgtcbMBM7DM
BWdiFvNml2uCbfoqp1oEsbYyeVYP+5pBnenl8snMAHdcVe84dUSVmdrhRFIC0enu
d4JoHiE0uDqh5NJ1wOPNo3FVbSbB2Q==
=WfFO
-----END PGP SIGNATURE-----

--Sig_/e8WJ.=ctS7b1q7BH3npLeZH--