| Message ID | 20230914102830.00537203@canb.auug.org.au |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the wireless-next tree with Linus' tree | expand |
diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index af155fca39b8,5ddc2d9a6060..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") 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.