From patchwork Fri May 21 15:41:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 53172 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 838FBB7D19 for ; Sat, 22 May 2010 01:42:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933592Ab0EUPmE (ORCPT ); Fri, 21 May 2010 11:42:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45860 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933248Ab0EUPmB (ORCPT ); Fri, 21 May 2010 11:42:01 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 445275FC9F; Fri, 21 May 2010 17:42:00 +0200 (CEST) Subject: bug fix patch lost: git problem or just incorrect merge? From: James Bottomley To: Linus Torvalds , David Miller Cc: linux-kernel , netdev@vger.kernel.org, linux-scsi Date: Fri, 21 May 2010 10:41:55 -0500 Message-ID: <1274456515.9022.14.camel@mulgrave.site> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch in question is this one (upstream for a while): commit d7d05548a62c87ee55b0c81933669177f885aa8d Author: Mike Christie Date: Wed Mar 31 14:41:35 2010 -0500 [SCSI] iscsi_tcp: fix relogin/shutdown hang It's a simple one line change in iscsi_tcp.c (diff clipped): Date: Wed May 12 00:05:35 2010 -0700 However, the curious thing is that git seems to have lost trace of the missing patch entirely: if I try to find it in linus' tree with a git log -- drivers/scsi/iscsi_tcp.c, it doesn't show up. The merge commit which killed it does list iscsi_tcp.c as a file conflict, but git show on that commit doesn't list that file in the resolution diff ... even though this is where it actually got killed. Is this a git problem ... or is it just a mismerge in the net tree? Either way, of course, we need the patch back ... James --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -599,7 +599,7 @@ static void iscsi_sw_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag) - if (sock->sk->sk_sleep && waitqueue_active(sock->sk->sk_sleep)) { + if (sock->sk->sk_sleep) { It was killed by this merge commit in the net-next tree: commit 278554bd6579206921f5d8a523649a7a57f8850d Merge: 5a147e8 cea0d76 Author: David S. Miller