Message ID | 1477597999-4261-1-git-send-email-vadimp@mellanox.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Better, but... When resending patch series, resend as a series. Otherwise sent them independently if it's the case. Remove 'drivers/' part from the subject and make it closer to ~70 characters all together. You have quite a few people in Cc list, try to leave only TWIMC categore of them, e.g. maintainers of both subsystems, mailing lists (LKML and x86@ I think would be enough). On Thu, 2016-10-27 at 19:53 +0000, Vadim Pasternak wrote: > Move module mlx-platform.c from arch/x86/platform/mellanox/ to > drivers/platform/x86/. > This doesn't answer to the question 'Why?'. First you have to express your intention and motivation behind, and after put "What is done". > Remove folder arch/x86/platform/mellanox/ and This is not done by the patch, it a side-effect of Git VCS. > update relevant Makefile > and Kconfig. > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> > v1->v2: > Comments pointed out by Andy: > - Use -M -C -n option in git format-patch; This should go exactly after '---' line. > --- > MAINTAINERS | 2 +- > arch/x86/Kconfig | 12 --- > --------- > arch/x86/platform/mellanox/Makefile | 1 - > drivers/platform/x86/Kconfig | 14 > +++++++++++++- > drivers/platform/x86/Makefile | 1 + > .../mellanox => drivers/platform/x86}/mlx-platform.c | 2 +- > 6 files changed, 16 insertions(+), 16 deletions(-) > delete mode 100644 arch/x86/platform/mellanox/Makefile > rename {arch/x86/platform/mellanox => drivers/platform/x86}/mlx- > platform.c (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 3e30399..960f364f 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -7879,7 +7879,7 @@ MELLANOX PLATFORM DRIVER > M: Vadim Pasternak <vadimp@mellanox.com> > L: platform-driver-x86@vger.kernel.org > S: Supported > -F: arch/x86/platform/mellanox/mlx-platform.c > +F: drivers/platform/x86/mlx-platform.c > > MELLANOX MLX CPLD HOTPLUG DRIVER > M: Vadim Pasternak <vadimp@mellanox.com> > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index bada636..ccd5ff7 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -550,18 +550,6 @@ config X86_INTEL_QUARK > Say Y here if you have a Quark based system such as the > Arduino > compatible Intel Galileo. > > -config MLX_PLATFORM > - tristate "Mellanox Technologies platform support" > - depends on X86_64 > - depends on X86_EXTENDED_PLATFORM > - ---help--- > - This option enables system support for the Mellanox > Technologies > - platform. > - > - Say Y here if you are building a kernel for Mellanox > system. > - > - Otherwise, say N. > - > config X86_INTEL_LPSS > bool "Intel Low Power Subsystem Support" > depends on X86 && ACPI > diff --git a/arch/x86/platform/mellanox/Makefile > b/arch/x86/platform/mellanox/Makefile > deleted file mode 100644 > index f43c931..0000000 > --- a/arch/x86/platform/mellanox/Makefile > +++ /dev/null > @@ -1 +0,0 @@ > -obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o > diff --git a/drivers/platform/x86/Kconfig > b/drivers/platform/x86/Kconfig > index 1853769..78ed245 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -1028,10 +1028,22 @@ config INTEL_TELEMETRY > directly via debugfs files. Various tools may use > this interface for SoC state monitoring. > > +config MLX_PLATFORM > + tristate "Mellanox Technologies platform support" > + depends on X86_64 > + ---help--- > + This option enables system support for the Mellanox > Technologies > + platform. The Mellanox systems provide data center > networking > + solutions based on Virtual Protocol Interconnect (VPI) > technology > + enable seamless connectivity to 56/100Gb/s InfiniBand or > 10/40/56GbE > + connection. > + > + If you have a Mellanox system, say Y or M here. > + > config MLX_CPLD_PLATFORM > tristate "Mellanox platform hotplug driver support" > default n > - depends on MLX_PLATFORM > + select MLX_PLATFORM This change is not explained in commit message. Why are you doing it? > select HWMON > select I2C > ---help--- > diff --git a/drivers/platform/x86/Makefile > b/drivers/platform/x86/Makefile > index 1f06b63..2d6a587 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -71,4 +71,5 @@ obj-$(CONFIG_INTEL_TELEMETRY) += > intel_telemetry_core.o \ > intel_telemetry_pltdrv.o \ > intel_telemetry_debugfs.o > obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o > +obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o > obj-$(CONFIG_MLX_CPLD_PLATFORM) += mlxcpld-hotplug.o > diff --git a/arch/x86/platform/mellanox/mlx-platform.c > b/drivers/platform/x86/mlx-platform.c > similarity index 99% > rename from arch/x86/platform/mellanox/mlx-platform.c > rename to drivers/platform/x86/mlx-platform.c > index 7dcfcca..86a1356 100644 > --- a/arch/x86/platform/mellanox/mlx-platform.c > +++ b/drivers/platform/x86/mlx-platform.c > @@ -1,5 +1,5 @@ > /* > - * arch/x86/platform/mellanox/mlx-platform.c > + * drivers/platform/x86/mlx-platform.c There is a common practice nowadays not to put filenames in the top of the files. You see the point here? Each time someone would like to move or rename file... Take a chance to remove it. > * Copyright (c) 2016 Mellanox Technologies. All rights reserved. > * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com> > *
Hi Vadim, [auto build test ERROR on platform-drivers-x86/for-next] [also build test ERROR on next-20161027] [cannot apply to v4.9-rc2] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] [Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on] [Check https://git-scm.com/docs/git-format-patch for more information] url: https://github.com/0day-ci/linux/commits/Vadim-Pasternak/drivers-platform-x86-move-module-mlx-platform-from-arch-x86-to-drivers-platform-x86/20161028-030308 base: git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> scripts/Makefile.build:44: arch/x86/platform/mellanox/Makefile: No such file or directory >> make[4]: *** No rule to make target 'arch/x86/platform/mellanox/Makefile'. make[4]: Failed to remake makefile 'arch/x86/platform/mellanox/Makefile'. vim +44 scripts/Makefile.build f77bf0142 Sam Ravnborg 2007-10-15 28 ldflags-y := d72e5edbf Sam Ravnborg 2007-05-28 29 720097d89 Sam Ravnborg 2009-04-19 30 subdir-asflags-y := 720097d89 Sam Ravnborg 2009-04-19 31 subdir-ccflags-y := 720097d89 Sam Ravnborg 2009-04-19 32 3156fd052 Robert P. J. Day 2008-02-18 33 # Read auto.conf if it exists, otherwise ignore c955ccafc Roman Zippel 2006-06-08 34 -include include/config/auto.conf ^1da177e4 Linus Torvalds 2005-04-16 35 20a468b51 Sam Ravnborg 2006-01-22 36 include scripts/Kbuild.include 20a468b51 Sam Ravnborg 2006-01-22 37 3156fd052 Robert P. J. Day 2008-02-18 38 # For backward compatibility check that these variables do not change 0c53c8e6e Sam Ravnborg 2007-10-14 39 save-cflags := $(CFLAGS) 0c53c8e6e Sam Ravnborg 2007-10-14 40 2a6914703 Sam Ravnborg 2005-07-25 41 # The filename Kbuild has precedence over Makefile db8c1a7b2 Sam Ravnborg 2005-07-27 42 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) 0c53c8e6e Sam Ravnborg 2007-10-14 43 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) 0c53c8e6e Sam Ravnborg 2007-10-14 @44 include $(kbuild-file) ^1da177e4 Linus Torvalds 2005-04-16 45 0c53c8e6e Sam Ravnborg 2007-10-14 46 # If the save-* variables changed error out 0c53c8e6e Sam Ravnborg 2007-10-14 47 ifeq ($(KBUILD_NOPEDANTIC),) 0c53c8e6e Sam Ravnborg 2007-10-14 48 ifneq ("$(save-cflags)","$(CFLAGS)") 49c57d254 Arnaud Lacombe 2011-08-15 49 $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y) 0c53c8e6e Sam Ravnborg 2007-10-14 50 endif 0c53c8e6e Sam Ravnborg 2007-10-14 51 endif 4a5838ad9 Borislav Petkov 2011-03-01 52 :::::: The code at line 44 was first introduced by commit :::::: 0c53c8e6eb456cde30f2305421c605713856abc8 kbuild: check for wrong use of CFLAGS :::::: TO: Sam Ravnborg <sam@neptun.(none)> :::::: CC: Sam Ravnborg <sam@neptun.(none)> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Vadim,
[auto build test ERROR on platform-drivers-x86/for-next]
[also build test ERROR on next-20161027]
[cannot apply to v4.9-rc2]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on]
[Check https://git-scm.com/docs/git-format-patch for more information]
url: https://github.com/0day-ci/linux/commits/Vadim-Pasternak/drivers-platform-x86-move-module-mlx-platform-from-arch-x86-to-drivers-platform-x86/20161028-030308
base: git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next
config: i386-randconfig-i1-201643 (attached as .config)
compiler: gcc-4.8 (Debian 4.8.4-1) 4.8.4
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
>> scripts/Makefile.modbuiltin:25: arch/x86/platform/mellanox/Makefile: No such file or directory
make[4]: *** No rule to make target 'arch/x86/platform/mellanox/Makefile'.
make[4]: Failed to remake makefile 'arch/x86/platform/mellanox/Makefile'.
vim +25 scripts/Makefile.modbuiltin
bc081dd6 Michal Marek 2009-12-07 9
bc081dd6 Michal Marek 2009-12-07 10 -include include/config/auto.conf
bc081dd6 Michal Marek 2009-12-07 11 # tristate.conf sets tristate variables to uppercase 'Y' or 'M'
bc081dd6 Michal Marek 2009-12-07 12 # That way, we get the list of built-in modules in obj-Y
bc081dd6 Michal Marek 2009-12-07 13 -include include/config/tristate.conf
bc081dd6 Michal Marek 2009-12-07 14
bc081dd6 Michal Marek 2009-12-07 15 include scripts/Kbuild.include
bc081dd6 Michal Marek 2009-12-07 16
607b30fc Michal Marek 2010-06-10 17 ifneq ($(KBUILD_SRC),)
607b30fc Michal Marek 2010-06-10 18 # Create output directory if not already present
607b30fc Michal Marek 2010-06-10 19 _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
607b30fc Michal Marek 2010-06-10 20 endif
607b30fc Michal Marek 2010-06-10 21
bc081dd6 Michal Marek 2009-12-07 22 # The filename Kbuild has precedence over Makefile
bc081dd6 Michal Marek 2009-12-07 23 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
bc081dd6 Michal Marek 2009-12-07 24 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
bc081dd6 Michal Marek 2009-12-07 @25 include $(kbuild-file)
bc081dd6 Michal Marek 2009-12-07 26
bc081dd6 Michal Marek 2009-12-07 27 include scripts/Makefile.lib
bc081dd6 Michal Marek 2009-12-07 28 __subdir-Y := $(patsubst %/,%,$(filter %/, $(obj-Y)))
bc081dd6 Michal Marek 2009-12-07 29 subdir-Y += $(__subdir-Y)
bc081dd6 Michal Marek 2009-12-07 30 subdir-ym := $(sort $(subdir-y) $(subdir-Y) $(subdir-m))
bc081dd6 Michal Marek 2009-12-07 31 subdir-ym := $(addprefix $(obj)/,$(subdir-ym))
bc081dd6 Michal Marek 2009-12-07 32 obj-Y := $(addprefix $(obj)/,$(obj-Y))
bc081dd6 Michal Marek 2009-12-07 33
:::::: The code at line 25 was first introduced by commit
:::::: bc081dd6e9f622c73334dc465359168543ccaabf kbuild: generate modules.builtin
:::::: TO: Michal Marek <mmarek@suse.cz>
:::::: CC: Michal Marek <mmarek@suse.cz>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/MAINTAINERS b/MAINTAINERS index 3e30399..960f364f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7879,7 +7879,7 @@ MELLANOX PLATFORM DRIVER M: Vadim Pasternak <vadimp@mellanox.com> L: platform-driver-x86@vger.kernel.org S: Supported -F: arch/x86/platform/mellanox/mlx-platform.c +F: drivers/platform/x86/mlx-platform.c MELLANOX MLX CPLD HOTPLUG DRIVER M: Vadim Pasternak <vadimp@mellanox.com> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bada636..ccd5ff7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -550,18 +550,6 @@ config X86_INTEL_QUARK Say Y here if you have a Quark based system such as the Arduino compatible Intel Galileo. -config MLX_PLATFORM - tristate "Mellanox Technologies platform support" - depends on X86_64 - depends on X86_EXTENDED_PLATFORM - ---help--- - This option enables system support for the Mellanox Technologies - platform. - - Say Y here if you are building a kernel for Mellanox system. - - Otherwise, say N. - config X86_INTEL_LPSS bool "Intel Low Power Subsystem Support" depends on X86 && ACPI diff --git a/arch/x86/platform/mellanox/Makefile b/arch/x86/platform/mellanox/Makefile deleted file mode 100644 index f43c931..0000000 --- a/arch/x86/platform/mellanox/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 1853769..78ed245 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1028,10 +1028,22 @@ config INTEL_TELEMETRY directly via debugfs files. Various tools may use this interface for SoC state monitoring. +config MLX_PLATFORM + tristate "Mellanox Technologies platform support" + depends on X86_64 + ---help--- + This option enables system support for the Mellanox Technologies + platform. The Mellanox systems provide data center networking + solutions based on Virtual Protocol Interconnect (VPI) technology + enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE + connection. + + If you have a Mellanox system, say Y or M here. + config MLX_CPLD_PLATFORM tristate "Mellanox platform hotplug driver support" default n - depends on MLX_PLATFORM + select MLX_PLATFORM select HWMON select I2C ---help--- diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 1f06b63..2d6a587 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -71,4 +71,5 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ intel_telemetry_pltdrv.o \ intel_telemetry_debugfs.o obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o +obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_MLX_CPLD_PLATFORM) += mlxcpld-hotplug.o diff --git a/arch/x86/platform/mellanox/mlx-platform.c b/drivers/platform/x86/mlx-platform.c similarity index 99% rename from arch/x86/platform/mellanox/mlx-platform.c rename to drivers/platform/x86/mlx-platform.c index 7dcfcca..86a1356 100644 --- a/arch/x86/platform/mellanox/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c @@ -1,5 +1,5 @@ /* - * arch/x86/platform/mellanox/mlx-platform.c + * drivers/platform/x86/mlx-platform.c * Copyright (c) 2016 Mellanox Technologies. All rights reserved. * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com> *
Move module mlx-platform.c from arch/x86/platform/mellanox/ to drivers/platform/x86/. Remove folder arch/x86/platform/mellanox/ and update relevant Makefile and Kconfig. Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> v1->v2: Comments pointed out by Andy: - Use -M -C -n option in git format-patch; --- MAINTAINERS | 2 +- arch/x86/Kconfig | 12 ------------ arch/x86/platform/mellanox/Makefile | 1 - drivers/platform/x86/Kconfig | 14 +++++++++++++- drivers/platform/x86/Makefile | 1 + .../mellanox => drivers/platform/x86}/mlx-platform.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 arch/x86/platform/mellanox/Makefile rename {arch/x86/platform/mellanox => drivers/platform/x86}/mlx-platform.c (99%)