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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <03a72c1e38a8967e477ea3edeaff3839c6149899.camel@sipsolutions.net>
Date: Tue, 24 Oct 2023 23:03:28 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Jakub Kicinski <kuba@...nel.org>
Cc: netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-2023-10-24

On Tue, 2023-10-24 at 14:01 -0700, Jakub Kicinski wrote:
> On Tue, 24 Oct 2023 22:54:50 +0200 Johannes Berg wrote:
> > > > 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.  
> > 
> > No, not really, nothing left that's not in wireless-next already (I
> > think), except maybe some tiny cleanups.
> > 
> > Just trying to make it easier for you, even if it's really not a complex
> > conflict :)
> 
> I think "Linus rules" would dictate that cross-merges to hide conflicts
> are a bad thing. We don't have much to win so let's stick to that :)

Fair enough :)

> Hopefully I can deal with the resolution, but if you want to be 100%
> sure - you can drop a git-rerere resolution somewhere I can fetch it.

No need I think, just the return codes changed in the -next version for
better skb drop reasons :)

johannes