Message ID | 1466186793.19647.113.camel@perches.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
I don’t yet know enough to comment on the relocation of vmw_pvscsi into a new vmware folder. I was considering offering a new patch that removed the “maintained by” from the two source files and updated MAINTAINERS, but I’m happy to defer to people with more experience. I’m fine either way. On 6/17/16, 11:06 AM, "Joe Perches" <joe@perches.com> wrote: > >Perhaps a patch like this: > >From e727c6549e3be466ec3c79e919502cb0b9909b03 Mon Sep 17 00:00:00 2001 >Message-Id: <e727c6549e3be466ec3c79e919502cb0b9909b03.1466186573.git.joe@perches.com> >From: Joe Perches <joe@perches.com> >Date: Fri, 17 Jun 2016 10:56:49 -0700 >Subject: [PATCH] vmw_pvscsi: Move into separate directory, Jim Gill is MAINTAINER > >Separate directories for drivers are generally better. > >Miscellanea: > >o Update the MAINTAINER entry >o Remove maintainer and FSF addresses from driver files >--- > MAINTAINERS | 5 ++--- > drivers/scsi/Kconfig | 8 +------- > drivers/scsi/Makefile | 2 +- > drivers/scsi/vmware/Kconfig | 7 +++++++ > drivers/scsi/vmware/Makefile | 1 + > drivers/scsi/{ => vmware}/vmw_pvscsi.c | 7 ------- > drivers/scsi/{ => vmware}/vmw_pvscsi.h | 7 ------- > 7 files changed, 12 insertions(+), 25 deletions(-) > create mode 100644 drivers/scsi/vmware/Kconfig > create mode 100644 drivers/scsi/vmware/Makefile > rename drivers/scsi/{ => vmware}/vmw_pvscsi.c (99%) > rename drivers/scsi/{ => vmware}/vmw_pvscsi.h (98%) > >diff --git a/MAINTAINERS b/MAINTAINERS >index d174e34..2763582 100644 >--- a/MAINTAINERS >+++ b/MAINTAINERS >@@ -12421,12 +12421,11 @@ S: Maintained > F: drivers/net/vmxnet3/ > > VMware PVSCSI driver >-M: Arvind Kumar <arvindkumar@vmware.com> >+M: Jim Gill <jgill@vmware.com> > M: VMware PV-Drivers <pv-drivers@vmware.com> > L: linux-scsi@vger.kernel.org > S: Maintained >-F: drivers/scsi/vmw_pvscsi.c >-F: drivers/scsi/vmw_pvscsi.h >+F: drivers/scsi/vmware/ > > VOLTAGE AND CURRENT REGULATOR FRAMEWORK > M: Liam Girdwood <lgirdwood@gmail.com> >diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig >index 1918f54..339c230 100644 >--- a/drivers/scsi/Kconfig >+++ b/drivers/scsi/Kconfig >@@ -576,13 +576,7 @@ config SCSI_FLASHPOINT > substantial, so users of MultiMaster Host Adapters may not > wish to include it. > >-config VMWARE_PVSCSI >- tristate "VMware PVSCSI driver support" >- depends on PCI && SCSI && X86 >- help >- This driver supports VMware's para virtualized SCSI HBA. >- To compile this driver as a module, choose M here: the >- module will be called vmw_pvscsi. >+source "drivers/scsi/vmware/Kconfig" > > config XEN_SCSI_FRONTEND > tristate "XEN SCSI frontend driver" >diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile >index 862ab4e..6cfefaa 100644 >--- a/drivers/scsi/Makefile >+++ b/drivers/scsi/Makefile >@@ -141,7 +141,7 @@ obj-$(CONFIG_BE2ISCSI) += libiscsi.o be2iscsi/ > obj-$(CONFIG_SCSI_ESAS2R) += esas2r/ > obj-$(CONFIG_SCSI_PMCRAID) += pmcraid.o > obj-$(CONFIG_SCSI_VIRTIO) += virtio_scsi.o >-obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o >+obj-$(CONFIG_VMWARE_PVSCSI) += vmware/ > obj-$(CONFIG_XEN_SCSI_FRONTEND) += xen-scsifront.o > obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o > obj-$(CONFIG_SCSI_WD719X) += wd719x.o >diff --git a/drivers/scsi/vmware/Kconfig b/drivers/scsi/vmware/Kconfig >new file mode 100644 >index 0000000..3c0c53b >--- /dev/null >+++ b/drivers/scsi/vmware/Kconfig >@@ -0,0 +1,7 @@ >+config VMWARE_PVSCSI >+ tristate "VMware PVSCSI driver support" >+ depends on PCI && SCSI && X86 >+ help >+ This driver supports VMware's para virtualized SCSI HBA. >+ To compile this driver as a module, choose M here: the >+ module will be called vmw_pvscsi. >diff --git a/drivers/scsi/vmware/Makefile b/drivers/scsi/vmware/Makefile >new file mode 100644 >index 0000000..ae8d278 >--- /dev/null >+++ b/drivers/scsi/vmware/Makefile >@@ -0,0 +1 @@ >+obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o >diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmware/vmw_pvscsi.c >similarity index 99% >rename from drivers/scsi/vmw_pvscsi.c >rename to drivers/scsi/vmware/vmw_pvscsi.c >index 6164634..eb1229e 100644 >--- a/drivers/scsi/vmw_pvscsi.c >+++ b/drivers/scsi/vmware/vmw_pvscsi.c >@@ -12,13 +12,6 @@ > * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or > * NON INFRINGEMENT. See the GNU General Public License for more > * details. >- * >- * You should have received a copy of the GNU General Public License >- * along with this program; if not, write to the Free Software >- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. >- * >- * Maintained by: Arvind Kumar <arvindkumar@vmware.com> >- * > */ > > #include <linux/kernel.h> >diff --git a/drivers/scsi/vmw_pvscsi.h b/drivers/scsi/vmware/vmw_pvscsi.h >similarity index 98% >rename from drivers/scsi/vmw_pvscsi.h >rename to drivers/scsi/vmware/vmw_pvscsi.h >index 12712c9..5f675b9 100644 >--- a/drivers/scsi/vmw_pvscsi.h >+++ b/drivers/scsi/vmware/vmw_pvscsi.h >@@ -12,13 +12,6 @@ > * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or > * NON INFRINGEMENT. See the GNU General Public License for more > * details. >- * >- * You should have received a copy of the GNU General Public License >- * along with this program; if not, write to the Free Software >- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. >- * >- * Maintained by: Arvind Kumar <arvindkumar@vmware.com> >- * > */ > > #ifndef _VMW_PVSCSI_H_ >-- >2.8.0.rc4.16.g56331f8 >
diff --git a/MAINTAINERS b/MAINTAINERS index d174e34..2763582 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12421,12 +12421,11 @@ S: Maintained F: drivers/net/vmxnet3/ VMware PVSCSI driver -M: Arvind Kumar <arvindkumar@vmware.com> +M: Jim Gill <jgill@vmware.com> M: VMware PV-Drivers <pv-drivers@vmware.com> L: linux-scsi@vger.kernel.org S: Maintained -F: drivers/scsi/vmw_pvscsi.c -F: drivers/scsi/vmw_pvscsi.h +F: drivers/scsi/vmware/ VOLTAGE AND CURRENT REGULATOR FRAMEWORK M: Liam Girdwood <lgirdwood@gmail.com> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 1918f54..339c230 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -576,13 +576,7 @@ config SCSI_FLASHPOINT substantial, so users of MultiMaster Host Adapters may not wish to include it. -config VMWARE_PVSCSI - tristate "VMware PVSCSI driver support" - depends on PCI && SCSI && X86 - help - This driver supports VMware's para virtualized SCSI HBA. - To compile this driver as a module, choose M here: the - module will be called vmw_pvscsi. +source "drivers/scsi/vmware/Kconfig" config XEN_SCSI_FRONTEND tristate "XEN SCSI frontend driver" diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 862ab4e..6cfefaa 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -141,7 +141,7 @@ obj-$(CONFIG_BE2ISCSI) += libiscsi.o be2iscsi/ obj-$(CONFIG_SCSI_ESAS2R) += esas2r/ obj-$(CONFIG_SCSI_PMCRAID) += pmcraid.o obj-$(CONFIG_SCSI_VIRTIO) += virtio_scsi.o -obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o +obj-$(CONFIG_VMWARE_PVSCSI) += vmware/ obj-$(CONFIG_XEN_SCSI_FRONTEND) += xen-scsifront.o obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o obj-$(CONFIG_SCSI_WD719X) += wd719x.o diff --git a/drivers/scsi/vmware/Kconfig b/drivers/scsi/vmware/Kconfig new file mode 100644 index 0000000..3c0c53b --- /dev/null +++ b/drivers/scsi/vmware/Kconfig @@ -0,0 +1,7 @@ +config VMWARE_PVSCSI + tristate "VMware PVSCSI driver support" + depends on PCI && SCSI && X86 + help + This driver supports VMware's para virtualized SCSI HBA. + To compile this driver as a module, choose M here: the + module will be called vmw_pvscsi. diff --git a/drivers/scsi/vmware/Makefile b/drivers/scsi/vmware/Makefile new file mode 100644 index 0000000..ae8d278 --- /dev/null +++ b/drivers/scsi/vmware/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmware/vmw_pvscsi.c similarity index 99% rename from drivers/scsi/vmw_pvscsi.c rename to drivers/scsi/vmware/vmw_pvscsi.c index 6164634..eb1229e 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmware/vmw_pvscsi.c @@ -12,13 +12,6 @@ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or * NON INFRINGEMENT. See the GNU General Public License for more * details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Maintained by: Arvind Kumar <arvindkumar@vmware.com> - * */ #include <linux/kernel.h> diff --git a/drivers/scsi/vmw_pvscsi.h b/drivers/scsi/vmware/vmw_pvscsi.h similarity index 98% rename from drivers/scsi/vmw_pvscsi.h rename to drivers/scsi/vmware/vmw_pvscsi.h index 12712c9..5f675b9 100644 --- a/drivers/scsi/vmw_pvscsi.h +++ b/drivers/scsi/vmware/vmw_pvscsi.h @@ -12,13 +12,6 @@ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or * NON INFRINGEMENT. See the GNU General Public License for more * details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Maintained by: Arvind Kumar <arvindkumar@vmware.com> - * */ #ifndef _VMW_PVSCSI_H_