netdev - Re: pull-request: wireless-2023-10-24

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Tue, 24 Oct 2023 13:52:08 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Johannes Berg <johannes@...solutions.net>
Cc: netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-2023-10-24

On Tue, 24 Oct 2023 22:25:18 +0200 Johannes Berg wrote:
> Are you planning to merge net into net-next really soon for some reason?

Submitting on Wed did cross my mind, but there's no solid plan.
Unless that changes, Paolo will submit net on Thursday, EU time.
And we'll cross-merge once Linux pulls. 

> If not, I can resolve this conflict and we'll include it in the next
> (and last) wireless-next pull request, which will be going out Thursday
> morning (Europe time.)

Sounds good! But do you need to do the resolution to put something 
on top? Otherwise we can deal with the conflict when pulling.