Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755088AbYJVPjN (ORCPT ); Wed, 22 Oct 2008 11:39:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756410AbYJVPiy (ORCPT ); Wed, 22 Oct 2008 11:38:54 -0400 Received: from g1t0026.austin.hp.com ([15.216.28.33]:17940 "EHLO g1t0026.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbYJVPiw convert rfc822-to-8bit (ORCPT ); Wed, 22 Oct 2008 11:38:52 -0400 From: "Miller, Mike (OS Dev)" To: Andrew Morton CC: "jens.axboe@oracle.com" , "linux-kernel@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "fujita.tomonori@lab.ntt.co.jp" , "adobriyan@gmail.com" Date: Wed, 22 Oct 2008 15:38:13 +0000 Subject: RE: [PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again) Thread-Topic: [PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again) Thread-Index: AckzzqQbDDWbezojRAGK5sLuntmueAAjMVUw Message-ID: <0F5B06BAB751E047AB5C87D1F77A77884C01AB25E5@GVW0547EXC.americas.hpqcorp.net> References: <20081021212322.GA6421@roadking.ldev.net> <20081021154408.ed96c9b3.akpm@linux-foundation.org> In-Reply-To: <20081021154408.ed96c9b3.akpm@linux-foundation.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3060 Lines: 98 > -----Original Message----- > From: Andrew Morton [mailto:akpm@linux-foundation.org] > Sent: Tuesday, October 21, 2008 5:44 PM > To: Miller, Mike (OS Dev) > Cc: jens.axboe@oracle.com; linux-kernel@vger.kernel.org; > linux-scsi@vger.kernel.org; fujita.tomonori@lab.ntt.co.jp; > adobriyan@gmail.com > Subject: Re: [PATCH 2/2] cciss:fix regression firmware not > displayed in procfs (again and again) > > On Tue, 21 Oct 2008 16:23:22 -0500 > Mike Miller wrote: > > > Patch 2 of 2 > > What happened with "1 of 2"? Andrew, That was the patch to fix the sysfs symlink. You merged it and then superceded with my later patch. --- snip ----- The patch titled cciss: fix sysfs regression has been removed from the -mm tree. Its filename was cciss-fix-sysfs-regression.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cciss: fix sysfs regression From: Mike Miller Fix a broken symlink in sysfs. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/block/cciss.c | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/block/cciss.c~cciss-fix-sysfs-regression drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-fix-sysfs-regression +++ a/drivers/block/cciss.c @@ -1365,6 +1365,7 @@ static void cciss_add_disk(ctlr_info_t * disk->first_minor = drv_index << NWD_SHIFT; disk->fops = &cciss_fops; disk->private_data = &h->drv[drv_index]; + disk->driverfs_dev = &h->pdev->dev; /* Set up queue information */ blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask); _ Patches currently in -mm which might be from mike.miller@hp.com are origin.patch cciss-fix-sysfs-regression.patch ----snip----- Actually, this looks like the right one. -- mikem > > > Sorry for the delay. I've been out of the office and the > network has > > been down since before lunch CDT. This regression was introduced by > > commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40. > > This patch fixes a regression where the controller firmware > version is > > not displayed in procfs. The previous patch would be called anytime > > something changed. This will get called only once for each > controller. > > > > In this patch I again initialize *inq_buff to NULL per Tomo's > > comments. I also use a goto clean 4 instead of returning > -ENOMEM if the kzalloc fails. > > > > I hope this finally meets everyones expectations. > > > > Please consider this for inclusion. > > > > Signed-off-by: Mike Miller > > So this fix is needed in 2.6.27.x, yes? > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/