From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kalle Valo <kvalo@kernel•org>,
Johannes Berg <johannes@sipsolutions•net>,
Wireless <linux-wireless@vger•kernel.org>
Cc: Aloka Dixit <quic_alokad@quicinc•com>,
Franziska Naepelt <franziska.naepelt@googlemail•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
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 Linus' tree
Date: Thu, 14 Sep 2023 10:28:30 +1000 [thread overview]
Message-ID: <20230914102830.00537203@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-09-14 0:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 0:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-09 0:44 linux-next: manual merge of the wireless-next tree with Linus' tree Stephen Rothwell
2024-10-09 6:43 ` Greg Kroah-Hartman
2024-10-09 6:51 ` Johannes Berg
2024-10-09 7:13 ` Greg Kroah-Hartman
2024-10-09 7:19 ` Johannes Berg
2024-10-09 7:27 ` Greg Kroah-Hartman
2024-10-09 8:30 ` Johannes Berg
2024-10-09 9:24 ` Greg Kroah-Hartman
2024-10-09 0:38 Stephen Rothwell
2023-09-26 1:54 Stephen Rothwell
2023-09-26 4:50 ` Greg Kroah-Hartman
2022-10-19 16:23 Stephen Rothwell
2022-10-19 23:23 ` Jakub Kicinski
2022-10-19 17:14 ` Stephen Rothwell
2022-10-19 23:52 ` Jakub Kicinski
2022-10-26 12:40 ` Kalle Valo
2022-10-26 14:35 ` Kalle Valo
2022-10-26 14:50 ` Kalle Valo
2013-07-25 1:37 Stephen Rothwell
2013-01-23 1:16 Stephen Rothwell
2013-01-23 20:18 ` Grumbach, Emmanuel
2011-11-22 3:20 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230914102830.00537203@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=franziska.naepelt@googlemail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=johannes.berg@intel$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=quic_alokad@quicinc$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox