From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: [PATCH 2/2] cciss: bump version to .20 to reflect new HW support Date: Tue, 10 Jun 2008 23:18:10 +0200 Message-ID: <20080610211810.GN20851@kernel.dk> References: <20080610161404.GB6808@roadking.ldev.net> <20080610135026.f17a2d3a.akpm@linux-foundation.org> <0F5B06BAB751E047AB5C87D1F77A77881F2C828381@GVW0547EXC.americas.hpqcorp.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from brick.kernel.dk ([87.55.233.238]:20714 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757922AbYFJVSN (ORCPT ); Tue, 10 Jun 2008 17:18:13 -0400 Content-Disposition: inline In-Reply-To: <0F5B06BAB751E047AB5C87D1F77A77881F2C828381@GVW0547EXC.americas.hpqcorp.net> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: "Miller, Mike (OS Dev)" Cc: Andrew Morton , "linux-kernel@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "Patterson, Andrew D (Linux R&D)" , "Chen, Justin" On Tue, Jun 10 2008, Miller, Mike (OS Dev) wrote: > > > > -----Original Message----- > > From: Andrew Morton [mailto:akpm@linux-foundation.org] > > Sent: Tuesday, June 10, 2008 3:50 PM > > To: Miller, Mike (OS Dev) > > Cc: jens.axboe@oracle.com; linux-kernel@vger.kernel.org; > > linux-scsi@vger.kernel.org; Patterson, Andrew D (Linux R&D); > > Chen, Justin > > Subject: Re: [PATCH 2/2] cciss: bump version to .20 to > > reflect new HW support > > > > On Tue, 10 Jun 2008 11:14:04 -0500 > > Mike Miller wrote: > > > > > PATCH 2/2 > > > This patch bumps the driver version to 3.6.20 to reflect the new > > > hardware support from patch 1 of this set. Please consider > > this for inclusion. > > > > > > Signed-off-by: Mike Miller > > > > > > diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index > > > ced904d..c21a5a9 100644 > > > --- a/drivers/block/cciss.c > > > +++ b/drivers/block/cciss.c > > > @@ -53,16 +53,16 @@ > > > #include > > > > > > #define CCISS_DRIVER_VERSION(maj,min,submin) > > > ((maj<<16)|(min<<8)|(submin)) -#define DRIVER_NAME "HP CISS > > Driver (v 3.6.14)" > > > -#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,14) > > > +#define DRIVER_NAME "HP CISS Driver (v 3.6.20)" > > > +#define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 20) > > > > > > /* Embedded module documentation macros - see modules.h */ > > > MODULE_AUTHOR("Hewlett-Packard Company"); > > -MODULE_DESCRIPTION("Driver > > > for HP Controller SA5xxx SA6xxx version 3.6.14"); > > > +MODULE_DESCRIPTION("Driver for HP Smart Array Controllers"); > > > MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 > > SA641 SA642 SA6400" > > > " SA6i P600 P800 P400 P400i E200 > > E200i E500 P700m" > > > " Smart Array G2 Series SAS/SATA > > Controllers"); > > > -MODULE_VERSION("3.6.14"); > > > +MODULE_VERSION("3.6.20"); > > > MODULE_LICENSE("GPL"); > > > > > > #include "cciss_cmd.h" > > > > I think it would be more logical to fold these two patches together. > > Jens at one time suggested I keep the version patch separate, IIRC. Did I? For a series of patches implementing various things, bumping the version at the end makes sense since it's tied to the series and not a specific patch. For a single patch, I'm fine with including the version change in there. -- Jens Axboe