| Message ID | 20230926115452.68a71261@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | linux-next: manual merge of the wireless-next tree with Linus' tree | expand |
On Tue, Sep 26, 2023 at 11:54:52AM +1000, Stephen Rothwell wrote: > 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") > bb55441c57cc ("wifi: cfg80211: split struct cfg80211_ap_settings") > > 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,1e683212027c..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_update *info) > +static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, > + struct net_device *ndev, > - struct cfg80211_beacon_data *info) > ++ struct cfg80211_ap_update *info) > { > struct adapter *adapter = rtw_netdev_priv(ndev); > Looks good to me, thanks! greg k-h
diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index af155fca39b8,1e683212027c..000000000000 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
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") bb55441c57cc ("wifi: cfg80211: split struct cfg80211_ap_settings") 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.