diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-25 09:32:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-25 09:32:45 -0700 |
| commit | bcc981e9ed84c678533299d7eff17d2c81e4d5de (patch) | |
| tree | d5fa794057f941fdae90d1564b80c8f05ca888e9 /fs/eventpoll.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 340ff60ae93a5db2b2be6f38868df9a1293b6007 (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a couple of regressions in the talitos driver that were
introduced back in 4.3.
The first bug causes a crash when the driver's AEAD functionality is
used while the second bug prevents its AEAD feature from working once
you get past the first bug"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: talitos - fix AEAD tcrypt tests
crypto: talitos - fix crash in talitos_cra_init()
Diffstat (limited to 'fs/eventpoll.c')
0 files changed, 0 insertions, 0 deletions