mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Kalle Valo <kvalo@kernel.org>
Cc: Wireless <linux-wireless@vger.kernel.org>,
	Daniel Gabay <daniel.gabay@intel.com>,
	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>
Subject: Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Date: Fri, 09 Feb 2024 08:03:42 +0100	[thread overview]
Message-ID: <e42a9ad67eada684fc1ee3d272774248ead9ae26.camel@sipsolutions.net> (raw)
In-Reply-To: <20240209105606.66e7808b@canb.auug.org.au>

Hi,

Thanks for the heads-up!

On Fri, 2024-02-09 at 10:56 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/mvm/tx.c
> 
> between commit:
> 
>   2e57b77583ca ("wifi: iwlwifi: mvm: use correct address 3 in A-MSDU")
> 
> from the wireless tree and commit:
> 
>   3d869feacb74 ("wifi: iwlwifi: mvm: use FW rate for non-data only on new devices")

I had a different (potential) conflict on my radar and pulled wireless
into wireless-next to avoid it, but this one wasn't on my radar at all.
Sorry about that.

> I fixed it up (see below)

That obviously looks fine, thanks!

johannes

  reply	other threads:[~2024-02-09  7:03 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-08 23:56 Stephen Rothwell
2024-02-09  7:03 ` Johannes Berg [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-11-11 16:27 Mark Brown
2026-11-10 19:34 Mark Brown
2026-11-10 18:38 Mark Brown
2026-11-10 18:38 Mark Brown
2026-09-15 14:20 Mark Brown
2026-09-09 12:12 Mark Brown
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-10-24  0:55 Stephen Rothwell
2024-10-24  6:58 ` Johannes Berg
2024-10-31  2:24 ` 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
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=e42a9ad67eada684fc1ee3d272774248ead9ae26.camel@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=daniel.gabay@intel.com \
    --cc=kvalo@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=miriam.rachel.korenblit@intel.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®