lkml.org 
[lkml]   [2018]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the crypto tree with the mac80211-next tree
From
Date
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

\
 
 \ /
  Last update: 2018-10-11 12:10    [W:0.047 / U:3.472 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site