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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230926115452.68a71261@canb.auug.org.au>
Date:   Tue, 26 Sep 2023 11:54:52 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kalle Valo <kvalo@...nel.org>,
        Johannes Berg <johannes@...solutions.net>,
        Wireless <linux-wireless@...r.kernel.org>
Cc:     Aloka Dixit <quic_alokad@...cinc.com>,
        Franziska Naepelt <franziska.naepelt@...glemail.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Johannes Berg <johannes.berg@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with Linus' tree

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);
  

Content of type "application/pgp-signature" skipped