lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Fri, 09 Feb 2024 08:03:42 +0100
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Kalle Valo <kvalo@...nel.org>
Cc: Wireless <linux-wireless@...r.kernel.org>, Daniel Gabay
 <daniel.gabay@...el.com>, 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,

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

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ