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 2015-05-29
Date: Mon, 01 Jun 2015 09:11:38 +0200 [thread overview]
Message-ID: <1433142698.3505.1.camel@sipsolutions.net> (raw)
In-Reply-To: <20150531.173534.725322474667007103.davem@davemloft.net>
On Sun, 2015-05-31 at 17:35 -0700, David Miller wrote:
> Pulled, but there was a small conflict in include/net/mac80211.h which seemed
> trivially resolvable. Take a look and send me a fixup if I got it wrong,
> thanks.
Looks good - it seems I managed to apply two different docbook fixes to
the two different trees ... Talk about being confused :)
johannes
prev parent reply other threads:[~2015-06-01 7:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 11:25 pull-request: mac80211-next 2015-05-29 Johannes Berg
2015-05-29 11:25 ` Johannes Berg
2015-06-01 0:35 ` David Miller
2015-06-01 0:35 ` David Miller
2015-06-01 7:11 ` 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=1433142698.3505.1.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.