Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9569f00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild updates from Michal Marek:
 - Make <modname>-m in makefiles work like <modname>-y and fix the
   fallout
 - Minor genksyms fix
 - Fix race with make -j install modules_install
 - Move -Wsign-compare from make W=1 to W=2
 - Other minor fixes

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Demote 'sign-compare' warning to W=2
  Makefile: revert "Makefile: Document ability to make file.lst and file.S" partially
  kbuild: Do not run modules_install and install in paralel
  genksyms: Handle string literals with spaces in reference files
  fixdep: constify strrcmp arguments
  ath10k: Fix build with CONFIG_THERMAL=m
  Revert "drm: Hack around CONFIG_AGP=m build failures"
  kbuild: Allow to specify composite modules with modname-m
  staging/ad7606: Actually build the interface modules
parents 0cf0305f 7599ea8b

Makefile

+7 −1
Original line number Diff line number Diff line
@@ -495,6 +495,12 @@ ifeq ($(KBUILD_EXTMOD),) 
                endif

        endif

endif

# install and module_install need also be processed one by one

ifneq ($(filter install,$(MAKECMDGOALS)),)

        ifneq ($(filter modules_install,$(MAKECMDGOALS)),)

	        mixed-targets := 1

        endif

endif



ifeq ($(mixed-targets),1)

# ===========================================================================
@@ -1259,7 +1265,7 @@ help: 
	@echo  '  firmware_install- Install all firmware to INSTALL_FW_PATH'

	@echo  '                    (default: $$(INSTALL_MOD_PATH)/lib/firmware)'

	@echo  '  dir/            - Build all files in dir and below'

	@echo  '  dir/file.[oisS] - Build specified target only'

	@echo  '  dir/file.[ois]  - Build specified target only'

	@echo  '  dir/file.lst    - Build specified mixed source/assembly target only'

	@echo  '                    (requires a recent binutils and recent build (System.map))'

	@echo  '  dir/file.ko     - Build module including final link'

drivers/gpu/drm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ drm-$(CONFIG_DRM_PANEL) += drm_panel.o 
drm-$(CONFIG_OF) += drm_of.o

drm-$(CONFIG_AGP) += drm_agpsupport.o



drm-y += $(drm-m)



drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \

		drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drivers/misc/ibmasm/ibmasm.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ void ibmasmfs_unregister(void); 
void ibmasmfs_add_sp(struct service_processor *sp);



/* uart */

#ifdef CONFIG_SERIAL_8250

#if IS_ENABLED(CONFIG_SERIAL_8250)

void ibmasm_register_uart(struct service_processor *sp);

void ibmasm_unregister_uart(struct service_processor *sp);

#else

drivers/net/wireless/ath/ath10k/thermal.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct ath10k_thermal { 
	int temperature;

};



#ifdef CONFIG_THERMAL

#if IS_REACHABLE(CONFIG_THERMAL)

int ath10k_thermal_register(struct ath10k *ar);

void ath10k_thermal_unregister(struct ath10k *ar);

void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);

drivers/staging/iio/adc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config AD7606_IFACE_PARALLEL 
	  ADC driver.



	  To compile this driver as a module, choose M here: the

	  module will be called ad7606_iface_parallel.

	  module will be called ad7606_parallel.



config AD7606_IFACE_SPI

	tristate "spi interface support"
@@ -34,7 +34,7 @@ config AD7606_IFACE_SPI 
	  ADC driver.



	  To compile this driver as a module, choose M here: the

	  module will be called ad7606_iface_spi.

	  module will be called ad7606_spi.



config AD7780

	tristate "Analog Devices AD7780 and similar ADCs driver"