Re: linux-next: manual merge of the crypto tree with the bluetooth tree

Hi Herbert, On Sun, 21 Jun 2015 08:33:32 +0800 Herbert Xu wrote: > > Actually I think that's all you need to do since the crypto tree > version no longer has the bug in question. Ah, excellent. Thanks for checking. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpjQk

Re: linux-next: manual merge of the crypto tree with the bluetooth tree

Hi Stephen: On Sat, Jun 20, 2015 at 04:22:24PM +1000, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in: > > net/mac802154/llsec.c > > between commit: > > 5b0579850017 ("mac802154: fix llsec authentication without encryption BUG") > >