diff options
author | Linus Torvalds <[email protected]> | 2018-07-03 09:53:43 -0700 |
---|---|---|
committer | Linus Torvalds <[email protected]> | 2018-07-03 09:53:43 -0700 |
commit | 410da1e12ffed61129d61df5b7adce4d08c7f17c (patch) | |
tree | a31418aa535c04f86aa4ac9a90185d322e58f364 /arch/powerpc/lib/code-patching.c | |
parent | d0fbad0aec1df29717fab736eb24c8a49cf2c70b (diff) |
net/smc: fix up merge error with poll changes
My networking merge (commit 4e33d7d47943: "Pull networking fixes from
David Miller") got the poll() handling conflict wrong for af_smc.
The conflict between my a11e1d432b51 ("Revert changes to convert to
->poll_mask() and aio IOCB_CMD_POLL") and Ursula Braun's 24ac3a08e658
("net/smc: rebuild nonblocking connect") should have left the call to
sock_poll_wait() in place, just without the socket lock release/retake.
And I really should have realized that. But happily, I at least asked
Ursula to double-check the merge, and she set me right.
This also fixes an incidental whitespace issue nearby that annoyed me
while looking at this.
Pointed-out-by: Ursula Braun <[email protected]>
Cc: David Miller <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
0 files changed, 0 insertions, 0 deletions