On Fri, Apr 24, 2020 at 03:15:46PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/vt6656/main_usb.c
>
> between commit:
>
> 664ba5180234 ("staging: vt6656: Fix calling conditions of vnt_set_bss_mode")
>
> from the staging.current tree and commit:
>
> 463288b98190 ("staging: vt6556: vnt_rf_setpower convert to use ieee80211_channel.")
>
> from the staging 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/vt6656/main_usb.c
> index 5f78cad3b647,3c76d3cb5bbe..000000000000
> --- a/drivers/staging/vt6656/main_usb.c
> +++ b/drivers/staging/vt6656/main_usb.c
> @@@ -743,13 -740,8 +736,12 @@@ static void vnt_bss_info_changed(struc
> vnt_update_pre_ed_threshold(priv, false);
> }
>
> + if (changed & (BSS_CHANGED_BASIC_RATES | BSS_CHANGED_ERP_PREAMBLE |
> + BSS_CHANGED_ERP_SLOT))
> + vnt_set_bss_mode(priv);
> +
> - if (changed & BSS_CHANGED_TXPOWER)
> - vnt_rf_setpower(priv, priv->current_rate,
> - conf->chandef.chan->hw_value);
> + if (changed & (BSS_CHANGED_TXPOWER | BSS_CHANGED_BANDWIDTH))
> + vnt_rf_setpower(priv, conf->chandef.chan);
>
> if (changed & BSS_CHANGED_BEACON_ENABLED) {
> dev_dbg(&priv->usb->dev,
Thanks, that looks correct, I'll handle this when the staging.linus
branch goes to Linus in a few days.
greg k-h
