From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Johannes Berg <johannes@sipsolutions.net>,
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: linux-next: manual merge of the crypto tree with the mac80211-next tree
Date: Thu, 11 Oct 2018 11:13:29 +1100 [thread overview]
Message-ID: <20181011111329.253f0689@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
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.
I fixed it up (I just used the mac80211-next versions of these 2 files
for now) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-10-11 0:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 0:13 Stephen Rothwell [this message]
2018-10-11 10:08 ` linux-next: manual merge of the crypto tree with the mac80211-next tree Johannes Berg
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=20181011111329.253f0689@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=herbert@gondor.apana.org.au \
--cc=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 \
/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