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]

Date:   Wed, 20 Jan 2021 12:37:52 -0800
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: mac80211 2021-01-18.2

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 :)

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