From: Jakub Kicinski <kuba@kernel.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: wireless-2023-10-24
Date: Tue, 24 Oct 2023 13:52:08 -0700 [thread overview]
Message-ID: <20231024135208.3e40b69a@kernel.org> (raw)
In-Reply-To: <1020bbec6fd85d55f0862b1aa147afbd25de3e74.camel@sipsolutions.net>
On Tue, 24 Oct 2023 22:25:18 +0200 Johannes Berg wrote:
> Are you planning to merge net into net-next really soon for some reason?
Submitting on Wed did cross my mind, but there's no solid plan.
Unless that changes, Paolo will submit net on Thursday, EU time.
And we'll cross-merge once Linux pulls.
> 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.
next prev parent reply other threads:[~2023-10-24 20:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 10:35 pull-request: wireless-2023-10-24 Johannes Berg
2023-10-24 20:20 ` patchwork-bot+netdevbpf
2023-10-24 20:25 ` Johannes Berg
2023-10-24 20:52 ` Jakub Kicinski [this message]
2023-10-24 20:54 ` Johannes Berg
2023-10-24 21:01 ` Jakub Kicinski
2023-10-24 21: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=20231024135208.3e40b69a@kernel.org \
--to=kuba@kernel.org \
--cc=johannes@sipsolutions.net \
--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;
as well as URLs for NNTP newsgroup(s).