netdev - Re: pull-request: mac80211 2021-01-18.2

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <16d5ca0467273e2d6f3830a161fe84de104447a6.camel@sipsolutions.net>
Date:   Wed, 20 Jan 2021 21:39:29 +0100
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: mac80211 2021-01-18.2

On Wed, 2021-01-20 at 12:37 -0800, Jakub Kicinski wrote:
> On Wed, 20 Jan 2021 18:59:21 +0100 Johannes Berg wrote:
> > Hi Jakub,
> > 
> > > This pull request was applied to netdev/net.git (refs/heads/master):  
> > 
> > Since you pulled this now, question:
> > 
> > I have some pending content for mac80211-next/net-next that either
> > conflicts with or requires a fix from here, or such.
> > 
> > Could you pull net into net-next, so I can get it into mac80211-next? Or
> > do you prefer another approach here? I could also double-apply the
> > single patch, or pull myself but then we'd get a lot of net content into
> > net-next only via mac80211-next which seems odd.
> 
> Just merged net -> net-next, you can do your thing :)

Ok cool, thanks.

> Out of curiosity are you going to rebase mac80211-next or send a PR,
> fast forward and then apply the conflicting patches?

Normally I'd send a PR for it and then fast-forward.

However, it's actually empty at the moment, so I'm just going to fast-
forward it to net-next before I apply the next patches :-)

johannes