From: Johannes Berg <johannes@sipsolutions.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kees Cook <keescook@chromium.org>
Subject: Re: linux-next: manual merge of the mac80211-next tree with Linus' tree
Date: Mon, 18 Jun 2018 09:07:39 +0200 [thread overview]
Message-ID: <1529305659.3490.0.camel@sipsolutions.net> (raw)
In-Reply-To: <20180618112943.4ceadf24@canb.auug.org.au>
On Mon, 2018-06-18 at 11:29 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mac80211-next tree got a conflict in:
>
> net/mac80211/scan.c
>
> between commit:
>
> 6396bb221514 ("treewide: kzalloc() -> kcalloc()")
>
> from Linus' tree and commit:
>
> b9771d41aee7 ("mac80211: support scan features for improved scan privacy")
>
> from the mac80211-next tree.
Thanks Stephen!
I guess there isn't all that much I can do, unless davem pulls Linus's
tree in and then I can pull his and resolve it. We'll see.
johannes
next prev parent reply other threads:[~2018-06-18 7:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 1:29 linux-next: manual merge of the mac80211-next tree with Linus' tree Stephen Rothwell
2018-06-18 7:07 ` Johannes Berg [this message]
2021-12-21 0:19 Stephen Rothwell
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=1529305659.3490.0.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).