diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 18:48:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 18:48:36 +0200 |
| commit | 70ca0a42fe1702ac0784386c44b05d18ee5f1f9e (patch) | |
| tree | cd9366330e409a354aa100685f162a5da638e286 /fs/ext3/balloc.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| download | linux-70ca0a42fe1702ac0784386c44b05d18ee5f1f9e.tar.xz linux-70ca0a42fe1702ac0784386c44b05d18ee5f1f9e.zip | |
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>
Diffstat (limited to 'fs/ext3/balloc.c')
0 files changed, 0 insertions, 0 deletions