Skip to content
Commit eccd02f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

crypto: fix mis-merge with the networking merge



The networking updates from David Miller removed the iocb argument from
sendmsg and recvmsg (in commit 1b784140: "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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa2e5c07
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment