From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
To: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: pull-request: mac80211-next 2018-06-29
Date: Sat, 30 Jun 2018 22:45:17 +0200 [thread overview]
Message-ID: <1530391517.7210.1.camel@sipsolutions.net> (raw)
In-Reply-To: <20180630.211728.888180353537471428.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
On Sat, 2018-06-30 at 21:17 +0900, David Miller wrote:
> From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
> Date: Fri, 29 Jun 2018 13:59:05 +0200
>
> > Here's the next round of -next updates. This includes the promised
> > HE stuff but it's not all that big in the end, most of it is just
> > additions to the protocol header file :-)
>
> :-)
>
> > Please pull and let me know if there's any problem.
>
> There was a small merge conflict in net/mac80211/scan.c, I arranged
> it such that the kcalloc() conversion was preserved.
Huh, sorry, hadn't seen that massive patch, I see it now.
> Please send me any necessary fixups if I didn't do it properly.
No need, looks fine. I diffed it to my tree and the only change is the
kcalloc conversion, as expected.
Thanks!
johannes
prev parent reply other threads:[~2018-06-30 20:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 11:59 pull-request: mac80211-next 2018-06-29 Johannes Berg
[not found] ` <20180629115906.2045-1-johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
2018-06-30 12:17 ` David Miller
[not found] ` <20180630.211728.888180353537471428.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2018-06-30 20:45 ` 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=1530391517.7210.1.camel@sipsolutions.net \
--to=johannes-cdvu00un1vgdhxzaddlk8q@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).