Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <16d5ca0467273e2d6f3830a161fe84de104447a6.camel@sipsolutions.net>
Subject: Re: pull-request: mac80211 2021-01-18.2
From:   Johannes Berg <johannes@sipsolutions.net>
To:     Jakub Kicinski <kuba@kernel.org>
Cc:     netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Date:   Wed, 20 Jan 2021 21:39:29 +0100
In-Reply-To: <20210120123752.636659d1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
References: <20210118204750.7243-1-johannes@sipsolutions.net>
         <161101020906.2232.13826999223880000897.git-patchwork-notify@kernel.org>
         <c066813abc5830eb094ae0c343a71e88b775b441.camel@sipsolutions.net>
         <20210120123752.636659d1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

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