From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Kalle Valo <kvalo@kernel•org>,
Johannes Berg <johannes@sipsolutions•net>,
Ben Greear <greearb@candelatech•com>,
Emmanuel Grumbach <emmanuel.grumbach@intel•com>,
Johannes Berg <johannes.berg@intel•com>,
Wireless <linux-wireless@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miri Korenblit <miriam.rachel.korenblit@intel•com>,
Networking <netdev@vger•kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Date: Thu, 31 Oct 2024 13:24:03 +1100 [thread overview]
Message-ID: <20241031132403.7b5a0ca5@canb.auug.org.au> (raw)
In-Reply-To: <20241024115523.4cd35dde@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]
Hi all,
On Thu, 24 Oct 2024 11:55:23 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
>
> diff --cc net/mac80211/cfg.c
> index 6dfc61a9acd4,6c0b228523cb..000000000000
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@@ -3046,7 -3070,7 +3070,8 @@@ static int ieee80211_set_tx_power(struc
> enum nl80211_tx_power_setting txp_type = type;
> bool update_txp_type = false;
> bool has_monitor = false;
> + int old_power = local->user_power_level;
> + int user_power_level;
>
> lockdep_assert_wiphy(local->hw.wiphy);
This is now a conflict between the net and net-next trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-10-31 2:24 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-24 0:55 linux-next: manual merge of the wireless-next tree with the wireless tree Stephen Rothwell
2024-10-24 6:58 ` Johannes Berg
2024-10-31 2:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-16 3:52 Stephen Rothwell
2025-07-16 8:59 ` Johannes Berg
2025-07-16 11:54 ` Stephen Rothwell
2025-07-16 17:18 ` Jeff Johnson
2024-10-28 1:36 Stephen Rothwell
2024-10-28 6:51 ` Johannes Berg
2024-10-31 2:20 ` Stephen Rothwell
2024-06-03 1:01 Stephen Rothwell
2024-06-03 10:01 ` Kalle Valo
2024-06-06 10:09 ` Kalle Valo
2024-06-07 9:44 ` Alexis Lothoré
2024-06-07 10:29 ` Kalle Valo
2024-05-31 2:44 Stephen Rothwell
2024-04-22 0:56 Stephen Rothwell
2024-03-25 23:09 Stephen Rothwell
2024-03-26 7:58 ` Johannes Berg
2024-02-08 23:56 Stephen Rothwell
2024-02-09 7:03 ` Johannes Berg
2023-09-26 2:20 Stephen Rothwell
2023-09-26 2:02 Stephen Rothwell
2023-09-26 2:41 ` Stephen Rothwell
2023-09-26 6:21 ` Johannes Berg
2023-09-12 2:46 Stephen Rothwell
2023-03-30 23:49 Stephen Rothwell
2023-03-31 9:17 ` Johannes Berg
2023-04-03 2:23 ` Stephen Rothwell
2023-04-03 8:43 ` Kalle Valo
2014-11-25 3:36 Stephen Rothwell
2013-12-03 0:20 Stephen Rothwell
2013-12-03 15:52 ` John W. Linville
2013-12-03 16:09 ` Johannes Berg
2013-12-03 18:12 ` Bob Copeland
2013-12-04 1:21 ` Yeoh Chun-Yeow
2013-08-19 2:41 Stephen Rothwell
2013-08-12 1:53 Stephen Rothwell
2013-08-12 15:15 ` John W. Linville
2013-08-12 15:34 ` Berg, Johannes
2013-06-07 2:56 Stephen Rothwell
2013-06-07 6:21 ` Sujith Manoharan
2013-03-26 1:18 Stephen Rothwell
2013-03-12 1:00 Stephen Rothwell
2012-11-15 2:17 Stephen Rothwell
2012-11-15 8:06 ` Arend van Spriel
2012-10-22 0:46 Stephen Rothwell
2012-10-22 0:13 Stephen Rothwell
2011-11-14 0:53 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=20241031132403.7b5a0ca5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=emmanuel.grumbach@intel$(echo .)com \
--cc=greearb@candelatech$(echo .)com \
--cc=johannes.berg@intel$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--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=miriam.rachel.korenblit@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(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