From: David Miller <davem@davemloft.net>
To: johannes@sipsolutions.net
Cc: netdev@vger.kernel.org
Subject: Re: merge net into net-next?
Date: Thu, 08 Jun 2017 10:19:52 -0400 (EDT) [thread overview]
Message-ID: <20170608.101952.1058268538534168493.davem@davemloft.net> (raw)
In-Reply-To: <1496924055.26119.1.camel@sipsolutions.net>
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 08 Jun 2017 14:14:15 +0200
> On Thu, 2017-06-08 at 14:10 +0200, Johannes Berg wrote:
>> Hi Dave,
>>
>> Could you do me a favour and merge net into net-next? I want to merge
>> that back in order to apply a patch to mac80211-next that otherwise
>> conflicts fairly badly with a change in mac80211.
>
> Wait, forget it. You already did, I just managed to somehow miss that -
> sorry for the noise!
Great, nothing for me to do!
next prev parent reply other threads:[~2017-06-08 14:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 12:10 merge net into net-next? Johannes Berg
2017-06-08 12:14 ` Johannes Berg
2017-06-08 14:19 ` David Miller [this message]
2017-06-08 14:19 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-01-05 11:09 merge net into net-next ? Antonio Quartulli
2014-01-06 6:16 ` David Miller
2014-01-06 22:39 ` David Miller
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=20170608.101952.1058268538534168493.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--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).