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 | eccd02f32a2c25139da2d5e72ebab1fee7b5baab (patch) | |
| tree | 5c89a70e59716e66a3ee9528aa4c36c1803a9340 /fs | |
| parent | Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc (diff) | |
| download | linux-dev-eccd02f32a2c25139da2d5e72ebab1fee7b5baab.tar.xz linux-dev-eccd02f32a2c25139da2d5e72ebab1fee7b5baab.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 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 <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions