Fix networking tree iscsi_tcp.c mis-merge
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 16:48:36 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 16:48:36 +0000 (09:48 -0700)
commit70ca0a42fe1702ac0784386c44b05d18ee5f1f9e
treecd9366330e409a354aa100685f162a5da638e286
parentd7dbf4ffee1c7a17e2e5b5f01efe76fbd1671db6
Fix networking tree iscsi_tcp.c mis-merge

The removal of the 'waitqueue_active()' test in commit d7d05548a6
("[SCSI] iscsi_tcp: fix relogin/shutdown hang") got incorrectly resolved
by David when he back-merged the main git tree into the networking tree
in commit 278554bd65 ("Merge branch 'master' of master.kernel.org:...").

There was a content conflict due to 'sock->sk->sk_sleep' being changed
into 'sk_sleep(sock->sk)' in the networking tree, but David didn't pick
up the iscsi change from the main tree.

Reported-by: James Bottomley <James.Bottomley@suse.de>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/scsi/iscsi_tcp.c