Subject: linux-next: manual merge of the wireless-next tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 14 Sep 2023 10:28:30 +1000

Hi all,

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

  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

between commit:

  1d85bb7fd66a ("staging: rtl8723bs: Fix alignment open parenthesis")

from Linus' tree and commit:

  66f85d57b710 ("wifi: cfg80211: modify prototype for change_beacon")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index af155fca39b8,5ddc2d9a6060..000000000000
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@@ -2317,9 -2318,8 +2317,9 @@@ static int cfg80211_rtw_start_ap(struc
  	return ret;
  }
  
 -static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
 -		struct cfg80211_ap_settings *info)
 +static int cfg80211_rtw_change_beacon(struct wiphy *wiphy,
 +				      struct net_device *ndev,
- 				      struct cfg80211_beacon_data *info)
++				      struct cfg80211_ap_settings *info)
  {
  	struct adapter *adapter = rtw_netdev_priv(ndev);