diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 14:09:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 14:09:46 -0700 |
| commit | d65dfe811f8a0124e493018e1d930f5ba92edc23 (patch) | |
| tree | c63b25cdc5cf57f63bdb15373609036a0a2c492f /crypto/xts.c | |
| parent | 75318e4036dfe7f82732dbba34695f7650fb89ec (diff) | |
| download | linux-crypto-d65dfe811f8a0124e493018e1d930f5ba92edc23.tar.gz linux-crypto-d65dfe811f8a0124e493018e1d930f5ba92edc23.zip | |
crypto: fix mis-merge with the networking merge
The networking updates from David Miller removed the iocb argument from
sendmsg and recvmsg (in commit 6eb61cea6738: "net: Remove iocb argument
from sendmsg and recvmsg"), but the crypto code had added new instances
of them.
When I pulled the crypto update, it was a silent semantic mis-merge, and
I overlooked the new warning messages in my test-build. I try to fix
those in the merge itself, but that relies on me noticing. Oh well.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto/xts.c')
0 files changed, 0 insertions, 0 deletions