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

[Herbert Xu]

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")
> 
> from the bluetooth tree and commit:
> 
>   25528fdae4ab ("mac802154: Switch to new AEAD interface")
> 
> from the crypto tree.
> 
> I just used the crypto tree version (effectively dropping the former
> commit) since it is more extensive and so a better conflict resolution
> is needed.

Actually I think that's all you need to do since the crypto tree
version no longer has the bug in question.

Thanks,
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/