From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Johannes Berg <johannes@sipsolutions•net>
Cc: Wireless <linux-wireless@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Felix Fietkau <nbd@nbd•name>, David Miller <davem@davemloft•net>
Subject: Re: linux-next: manual merge of the mac80211-next tree with the mac80211 tree
Date: Tue, 9 Apr 2019 18:11:14 +1000 [thread overview]
Message-ID: <20190409181114.0513c896@canb.auug.org.au> (raw)
In-Reply-To: <7deebb8e8c82e4455af8fc4963ffc7acca3aab36.camel@sipsolutions.net>
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
Hi Johannes,
On Tue, 09 Apr 2019 09:27:35 +0200 Johannes Berg <johannes@sipsolutions•net> wrote:
>
> But yes, I'm aware. It seemed simple enough though that I decided to
> keep it like that, I didn't really find a better solution.
Yeah, pretty trivial. I assume both trees will meet in Dave's tree at some point.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-04-09 8:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 1:06 linux-next: manual merge of the mac80211-next tree with the mac80211 tree Stephen Rothwell
2019-04-09 7:27 ` Johannes Berg
2019-04-09 8:11 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-16 0:13 Stephen Rothwell
2018-01-16 7:58 ` Johannes Berg
2015-12-03 11:28 Mark Brown
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=20190409181114.0513c896@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=nbd@nbd$(echo .)name \
/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