From: Johannes Berg <johannes@sipsolutions.net>
To: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: mac80211 2021-01-18.2
Date: Wed, 20 Jan 2021 21:39:29 +0100 [thread overview]
Message-ID: <16d5ca0467273e2d6f3830a161fe84de104447a6.camel@sipsolutions.net> (raw)
In-Reply-To: <20210120123752.636659d1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
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
next prev parent reply other threads:[~2021-01-20 20:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 20:47 pull-request: mac80211 2021-01-18.2 Johannes Berg
2021-01-18 22:50 ` patchwork-bot+netdevbpf
2021-01-20 17:59 ` Johannes Berg
2021-01-20 20:37 ` Jakub Kicinski
2021-01-20 20:39 ` Johannes Berg [this message]
2021-01-23 21:31 ` Hans de Goede
2021-01-23 22:15 ` Johannes Berg
2021-01-24 9:12 ` Peer, Ilan
2021-01-24 10:54 ` Hans de Goede
2021-01-24 13:03 ` Peer, Ilan
2021-01-25 9:47 ` Johannes Berg
2021-01-25 11:18 ` Hans de Goede
2021-01-25 12:40 ` Johannes Berg
2021-01-25 12:59 ` Hans de Goede
2021-01-25 13:03 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16d5ca0467273e2d6f3830a161fe84de104447a6.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox