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 2019-04-26
Date: Fri, 26 Apr 2019 22:13:53 +0200 [thread overview]
Message-ID: <01f1037952f77ae1aefc874ad02181fd5fa9c802.camel@sipsolutions.net> (raw)
In-Reply-To: <20190426.161122.317429832030080154.davem@davemloft.net>
On Fri, 2019-04-26 at 16:11 -0400, David Miller wrote:
> From: Johannes Berg <johannes@sipsolutions.net>
> Date: Fri, 26 Apr 2019 13:11:38 +0200
>
> > And another set for -next, not that big this time.
> > See below for a summary of the highlights.
> >
> > Please pull and let me know if there's any problem.
>
> Pulled, thanks Johannes.
>
> There was a minor confict in the TX code, two variables being added
> from different commits.
Oops, yeah, I knew about this but forgot to mention it, sorry about
that.
> Please double check my conflict resolution.
Looks fine, the order of the variables doesn't really matter and we do
need them both now :-)
johannes
prev parent reply other threads:[~2019-04-26 20:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 11:11 pull-request: mac80211-next 2019-04-26 Johannes Berg
2019-04-26 20:11 ` David Miller
2019-04-26 20:13 ` 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=01f1037952f77ae1aefc874ad02181fd5fa9c802.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