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

From: Stephen Rothwell
Date: Sat Jun 20 2015 - 02:23:07 EST

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:


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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpiKiqPwYDKq.pgp
Description: OpenPGP digital signature