[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2bab16fa9140f8b9515c5d471ec20c5e47c877e1.camel@sipsolutions.net>
Date: Thu, 24 Oct 2024 08:58:02 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Kalle Valo <kvalo@...nel.org>
Cc: Ben Greear <greearb@...delatech.com>, Emmanuel Grumbach
<emmanuel.grumbach@...el.com>, Wireless <linux-wireless@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
Mailing List <linux-next@...r.kernel.org>, Miri Korenblit
<miriam.rachel.korenblit@...el.com>
Subject: Re: linux-next: manual merge of the wireless-next tree with the
wireless tree
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
Powered by blists - more mailing lists