From: Linus Torvalds Date: Wed, 15 Apr 2015 21:09:46 +0000 (-0700) Subject: crypto: fix mis-merge with the networking merge X-Git-Tag: omap-for-v4.2/o2_dc~122 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eccd02f32a2c25139da2d5e72ebab1fee7b5baab;p=pandora-kernel.git crypto: fix mis-merge with the networking merge The networking updates from David Miller removed the iocb argument from sendmsg and recvmsg (in commit 1b784140474e: "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 --- Reading git-diff-tree failed