From: Johannes Berg <johannes@sipsolutions.net>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: mac80211-next 2016-02-26
Date: Wed, 02 Mar 2016 00:16:26 +0100 [thread overview]
Message-ID: <1456874186.7678.0.camel@sipsolutions.net> (raw)
In-Reply-To: <20160301.171110.1945667051881874679.davem@davemloft.net>
On Tue, 2016-03-01 at 17:11 -0500, David Miller wrote:
>
> There was a minor merge conflict with net/mac80211/debugfs.c, take
> a look and send me any fixups necessary.
>
Ah yes, I'd wondered when that change was coming in, but missed that
you had it in net-next now.
Looks good, thanks!
johannes
prev parent reply other threads:[~2016-03-01 23:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 20:37 pull-request: mac80211-next 2016-02-26 Johannes Berg
2016-03-01 22:11 ` David Miller
2016-03-01 23:16 ` Johannes Berg [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=1456874186.7678.0.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=davem@davemloft.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).