From: Johannes Berg <johannes@sipsolutions.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Herbert Xu <herbert@gondor.apana.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 crypto tree with the mac80211-next tree
Date: Thu, 11 Oct 2018 12:08:57 +0200 [thread overview]
Message-ID: <1539252537.3687.209.camel@sipsolutions.net> (raw)
In-Reply-To: <20181011111329.253f0689@canb.auug.org.au>
On Thu, 2018-10-11 at 11:13 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the crypto tree got conflicts in:
>
> net/wireless/lib80211_crypt_tkip.c
> net/wireless/lib80211_crypt_wep.c
>
> between commit:
>
> b802a5d6f345 ("lib80211: don't use skcipher")
>
> from the mac80211-next tree and commit:
>
> db20f570e17a ("lib80211: Remove VLA usage of skcipher")
>
> from the crypto tree.
Thanks Stephen.
The fixup (use mac80211-next file) is fine, but I'm not sure we want to
bother Linus/Greg with it?
Herbert, maybe you can drop the patch from the crypto tree since my
change also removes the VLA usage?
johannes
next prev parent reply other threads:[~2018-10-11 10:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 0:13 linux-next: manual merge of the crypto tree with the mac80211-next tree Stephen Rothwell
2018-10-11 10:08 ` Johannes Berg [this message]
2018-10-11 12:49 ` Herbert Xu
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=1539252537.3687.209.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=herbert@gondor.apana.org.au \
--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).