linux-next: manual merge of the wireless-next tree with the wireless tree

Commit Message

Stephen Rothwell Oct. 24, 2024, 12:55 a.m. UTC

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/cfg.c

between commit:

  8dd0498983ee ("wifi: mac80211: Fix setting txpower with emulate_chanctx")

from the wireless tree and commit:

  c4382d5ca1af ("wifi: mac80211: update the right link for tx power")

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.

Comments

Johannes Berg Oct. 24, 2024, 6:58 a.m. UTC | #1

Hi Stephen,

> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   net/mac80211/cfg.c
> 
> between commit:
> 
>   8dd0498983ee ("wifi: mac80211: Fix setting txpower with emulate_chanctx")
> 
> from the wireless tree and commit:
> 
>   c4382d5ca1af ("wifi: mac80211: update the right link for tx power")
> 
> from the wireless-next tree.

Yeah, I'm aware, we need to flush our trees.

> I fixed it up (see below)

Looks good, thanks :)

johannes

Patch

diff --cc net/mac80211/cfg.c
index 6dfc61a9acd4,6c0b228523cb..000000000000
--- a/net/mac80211/cfg.c