* linux-next: manual merge of the crypto tree with the mac80211-next tree
@ 2018-10-11 0:13 Stephen Rothwell
2018-10-11 10:08 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-10-11 0:13 UTC (permalink / raw)
To: Herbert Xu, Johannes Berg, Wireless
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the mac80211-next tree
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
2018-10-11 12:49 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2018-10-11 10:08 UTC (permalink / raw)
To: Stephen Rothwell, Herbert Xu, Wireless
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the mac80211-next tree
2018-10-11 10:08 ` Johannes Berg
@ 2018-10-11 12:49 ` Herbert Xu
0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2018-10-11 12:49 UTC (permalink / raw)
To: Johannes Berg
Cc: Stephen Rothwell, Wireless, Linux-Next Mailing List,
Linux Kernel Mailing List, Kees Cook
On Thu, Oct 11, 2018 at 12:08:57PM +0200, Johannes Berg wrote:
>
> Herbert, maybe you can drop the patch from the crypto tree since my
> change also removes the VLA usage?
Sorry but it's too late now.
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-11 12:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2018-10-11 12:49 ` Herbert Xu
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).