From: Johannes Berg <johannes@sipsolutions•net>
To: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Kalle Valo <kvalo@kernel•org>, Al Viro <viro@zeniv•linux.org.uk>,
Wireless <linux-wireless@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tree Davies <tdavies@darkphysics•net>
Subject: Re: linux-next: manual merge of the wireless-next tree with Linus' tree
Date: Wed, 09 Oct 2024 10:30:12 +0200 [thread overview]
Message-ID: <287ad9eeb94f1e326c22fdcb74c94ef3fde84115.camel@sipsolutions.net> (raw)
In-Reply-To: <2024100941-gaining-sprang-826b@gregkh>
On Wed, 2024-10-09 at 09:27 +0200, Greg Kroah-Hartman wrote:
> >
> > I can push out the net-next merge (& revert) soon, and then it'll all be
> > cleaner?
>
> Sure, I'll wait, just let me know what commit to merge at, from what
> tree, whenever you have it ready.
>
I've done all that now, so you could merge wireless-next/main up to its
head, which right now is a0efa2f362a6 ("Merge net-next/main to resolve
conflicts").
johannes
next prev parent reply other threads:[~2024-10-09 8:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 0:44 linux-next: manual merge of the wireless-next tree with Linus' tree Stephen Rothwell
2024-10-09 6:43 ` Greg Kroah-Hartman
2024-10-09 6:51 ` Johannes Berg
2024-10-09 7:13 ` Greg Kroah-Hartman
2024-10-09 7:19 ` Johannes Berg
2024-10-09 7:27 ` Greg Kroah-Hartman
2024-10-09 8:30 ` Johannes Berg [this message]
2024-10-09 9:24 ` Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2024-10-09 0:38 Stephen Rothwell
2023-09-26 1:54 Stephen Rothwell
2023-09-26 4:50 ` Greg Kroah-Hartman
2023-09-14 0:28 Stephen Rothwell
2022-10-19 16:23 Stephen Rothwell
2022-10-19 23:23 ` Jakub Kicinski
2022-10-19 17:14 ` Stephen Rothwell
2022-10-19 23:52 ` Jakub Kicinski
2022-10-26 12:40 ` Kalle Valo
2022-10-26 14:35 ` Kalle Valo
2022-10-26 14:50 ` Kalle Valo
2013-07-25 1:37 Stephen Rothwell
2013-01-23 1:16 Stephen Rothwell
2013-01-23 20:18 ` Grumbach, Emmanuel
2011-11-22 3:20 Stephen Rothwell
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=287ad9eeb94f1e326c22fdcb74c94ef3fde84115.camel@sipsolutions.net \
--to=johannes@sipsolutions$(echo .)net \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tdavies@darkphysics$(echo .)net \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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