mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Here's the big, really big, staging tree patches for 4.2-rc1. Loads of stuff in here, almost all just coding style fixes / churn, and a few new drivers as well, one of which I just disabled from the build a few minutes ago due to way too many build warnings. Other than the one "disable this driver" patch, all of these have been in linux-next for quite a while with no reported issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlWNpc0ACgkQMUfUDdst+ym8EgCg0pL1Qcf9Se3jAc96fLt+itpv Rd0AoI9uJcq8Qm7d+IXnz3ojLnN9xvN3 =xt0u -----END PGP SIGNATURE----- Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver updates from Greg KH: "Here's the big, really big, staging tree patches for 4.2-rc1. Loads of stuff in here, almost all just coding style fixes / churn, and a few new drivers as well, one of which I just disabled from the build a few minutes ago due to way too many build warnings. Other than the one "disable this driver" patch, all of these have been in linux-next for quite a while with no reported issues" * tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1163 commits) staging: wilc1000: disable driver due to build warnings Staging: rts5208: fix CHANGE_LINK_STATE value Staging: sm750fb: ddk750_swi2c.c: Insert spaces before parenthesis Staging: sm750fb: ddk750_swi2c.c: Place braces on correct lines Staging: sm750fb: ddk750_swi2c.c: Insert spaces around operators Staging: sm750fb: ddk750_swi2c.c: Replace spaces with tabs Staging: sm750fb: ddk750_swi2c.h: Shorten lines to under 80 characters Staging: sm750fb: ddk750_swi2c.h: Replace spaces with tabs Staging: sm750fb: modedb.h: Shorten lines to under 80 characters Staging: sm750fb: modedb.h: Replace spaces with tabs staging: comedi: addi_apci_3120: rename 'this_board' variables staging: comedi: addi_apci_1516: rename 'this_board' variables staging: comedi: ni_atmio: cleanup ni_getboardtype() staging: comedi: vmk80xx: sanity check context used to get the boardinfo staging: comedi: vmk80xx: rename 'boardinfo' variables staging: comedi: dt3000: rename 'this_board' variables staging: comedi: adv_pci_dio: rename 'this_board' variables staging: comedi: cb_pcidas64: rename 'thisboard' variables staging: comedi: cb_pcidas: rename 'thisboard' variables staging: comedi: me4000: rename 'thisboard' variables ...
141 lines
3.9 KiB
Makefile
141 lines
3.9 KiB
Makefile
# Some of the tools (perf) use same make variables
|
|
# as in kernel build.
|
|
export srctree=
|
|
export objtree=
|
|
|
|
include scripts/Makefile.include
|
|
|
|
help:
|
|
@echo 'Possible targets:'
|
|
@echo ''
|
|
@echo ' acpi - ACPI tools'
|
|
@echo ' cgroup - cgroup tools'
|
|
@echo ' cpupower - a tool for all things x86 CPU power'
|
|
@echo ' firewire - the userspace part of nosy, an IEEE-1394 traffic sniffer'
|
|
@echo ' hv - tools used when in Hyper-V clients'
|
|
@echo ' iio - IIO tools'
|
|
@echo ' lguest - a minimal 32-bit x86 hypervisor'
|
|
@echo ' perf - Linux performance measurement and analysis tool'
|
|
@echo ' selftests - various kernel selftests'
|
|
@echo ' turbostat - Intel CPU idle stats and freq reporting tool'
|
|
@echo ' usb - USB testing tools'
|
|
@echo ' virtio - vhost test module'
|
|
@echo ' net - misc networking tools'
|
|
@echo ' vm - misc vm tools'
|
|
@echo ' x86_energy_perf_policy - Intel energy policy tool'
|
|
@echo ' tmon - thermal monitoring and tuning tool'
|
|
@echo ' freefall - laptop accelerometer program for disk protection'
|
|
@echo ''
|
|
@echo 'You can do:'
|
|
@echo ' $$ make -C tools/ <tool>_install'
|
|
@echo ''
|
|
@echo ' from the kernel command line to build and install one of'
|
|
@echo ' the tools above'
|
|
@echo ''
|
|
@echo ' $$ make tools/install'
|
|
@echo ''
|
|
@echo ' installs all tools.'
|
|
@echo ''
|
|
@echo 'Cleaning targets:'
|
|
@echo ''
|
|
@echo ' all of the above with the "_clean" string appended cleans'
|
|
@echo ' the respective build directory.'
|
|
@echo ' clean: a summary clean target to clean _all_ folders'
|
|
|
|
acpi: FORCE
|
|
$(call descend,power/$@)
|
|
|
|
cpupower: FORCE
|
|
$(call descend,power/$@)
|
|
|
|
cgroup firewire hv guest usb virtio vm net iio: FORCE
|
|
$(call descend,$@)
|
|
|
|
liblockdep: FORCE
|
|
$(call descend,lib/lockdep)
|
|
|
|
libapi: FORCE
|
|
$(call descend,lib/api)
|
|
|
|
# The perf build does not follow the descend function setup,
|
|
# invoking it via it's own make rule.
|
|
PERF_O = $(if $(O),$(O)/tools/perf,)
|
|
|
|
perf: FORCE
|
|
$(Q)mkdir -p $(PERF_O) .
|
|
$(Q)$(MAKE) --no-print-directory -C perf O=$(PERF_O) subdir=
|
|
|
|
selftests: FORCE
|
|
$(call descend,testing/$@)
|
|
|
|
turbostat x86_energy_perf_policy: FORCE
|
|
$(call descend,power/x86/$@)
|
|
|
|
tmon: FORCE
|
|
$(call descend,thermal/$@)
|
|
|
|
freefall: FORCE
|
|
$(call descend,laptop/$@)
|
|
|
|
acpi_install:
|
|
$(call descend,power/$(@:_install=),install)
|
|
|
|
cpupower_install:
|
|
$(call descend,power/$(@:_install=),install)
|
|
|
|
cgroup_install firewire_install hv_install lguest_install perf_install usb_install virtio_install vm_install net_install:
|
|
$(call descend,$(@:_install=),install)
|
|
|
|
selftests_install:
|
|
$(call descend,testing/$(@:_clean=),install)
|
|
|
|
turbostat_install x86_energy_perf_policy_install:
|
|
$(call descend,power/x86/$(@:_install=),install)
|
|
|
|
tmon_install:
|
|
$(call descend,thermal/$(@:_install=),install)
|
|
|
|
freefall_install:
|
|
$(call descend,laptop/$(@:_install=),install)
|
|
|
|
install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \
|
|
perf_install selftests_install turbostat_install usb_install \
|
|
virtio_install vm_install net_install x86_energy_perf_policy_install \
|
|
tmon freefall_install
|
|
|
|
acpi_clean:
|
|
$(call descend,power/acpi,clean)
|
|
|
|
cpupower_clean:
|
|
$(call descend,power/cpupower,clean)
|
|
|
|
cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean iio_clean:
|
|
$(call descend,$(@:_clean=),clean)
|
|
|
|
liblockdep_clean:
|
|
$(call descend,lib/lockdep,clean)
|
|
|
|
libapi_clean:
|
|
$(call descend,lib/api,clean)
|
|
|
|
perf_clean:
|
|
$(call descend,$(@:_clean=),clean)
|
|
|
|
selftests_clean:
|
|
$(call descend,testing/$(@:_clean=),clean)
|
|
|
|
turbostat_clean x86_energy_perf_policy_clean:
|
|
$(call descend,power/x86/$(@:_clean=),clean)
|
|
|
|
tmon_clean:
|
|
$(call descend,thermal/tmon,clean)
|
|
|
|
freefall_clean:
|
|
$(call descend,laptop/freefall,clean)
|
|
|
|
clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
|
|
perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
|
|
vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
|
|
freefall_clean
|
|
|
|
.PHONY: FORCE
|