From: Jakub Kicinski <kuba@kernel.org>
To: Matthieu Baerts <matthieu.baerts@tessares.net>,
Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: pull-request: wireless-2023-03-10: manual merge
Date: Mon, 13 Mar 2023 10:32:12 -0700 [thread overview]
Message-ID: <20230313103212.2340fbd4@kernel.org> (raw)
In-Reply-To: <7b08d514-1cfa-4674-2b2a-cffd1f8994a5@tessares.net>
On Mon, 13 Mar 2023 14:03:12 +0100 Matthieu Baerts wrote:
> I don't think there is anything else you can do apart from confirming
> the merge resolution looks good to you :)
Yup, don't do anything special, we'll resolve based on what Stephen
and Matthieu suggest and feed the resolution back to you after your
next PR.
prev parent reply other threads:[~2023-03-13 17:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-10 11:46 pull-request: wireless-2023-03-10 Johannes Berg
2023-03-11 2:30 ` patchwork-bot+netdevbpf
2023-03-13 8:04 ` pull-request: wireless-2023-03-10: manual merge Matthieu Baerts
2023-03-13 9:13 ` Johannes Berg
2023-03-13 13:03 ` Matthieu Baerts
2023-03-13 17:32 ` Jakub Kicinski [this message]
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=20230313103212.2340fbd4@kernel.org \
--to=kuba@kernel.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).