Merge branch 'linus' into sched/core, to pick up fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-10 20:48:12 +00:00 · 2015-09-18 09:22:55 +02:00 · 2015-09-18 09:22:55 +02:00 · 0c6a5b4319
commit 0c6a5b4319
parent 006cdf025a a7d5c18971
169 changed files with 14623 additions and 14425 deletions
--- a/Documentation/gpio/board.txt
+++ b/Documentation/gpio/board.txt
--- a/Documentation/gpio/consumer.txt
+++ b/Documentation/gpio/consumer.txt
--- a/Documentation/hwmon/nct6775
+++ b/Documentation/hwmon/nct6775
--- a/Documentation/static-keys.txt
+++ b/Documentation/static-keys.txt
--- a/4
+++ b/4
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
--- a/arch/alpha/lib/udelay.c
+++ b/arch/alpha/lib/udelay.c
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/nwfpe/entry.S
+++ b/arch/arm/nwfpe/entry.S
--- a/arch/arm/xen/hypercall.S
+++ b/arch/arm/xen/hypercall.S
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
--- a/arch/arm64/kernel/module.c
+++ b/arch/arm64/kernel/module.c
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
--- a/arch/ia64/include/uapi/asm/unistd.h
+++ b/arch/ia64/include/uapi/asm/unistd.h
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
--- a/arch/x86/include/asm/qspinlock.h
+++ b/arch/x86/include/asm/qspinlock.h
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
--- a/drivers/clk/h8300/clk-h8s2678.c
+++ b/drivers/clk/h8300/clk-h8s2678.c
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
--- a/drivers/clk/hisilicon/Makefile
+++ b/drivers/clk/hisilicon/Makefile
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
--- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
--- a/drivers/infiniband/hw/Makefile
+++ b/drivers/infiniband/hw/Makefile
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
--- a/drivers/pinctrl/samsung/pinctrl-s3c24xx.c
+++ b/drivers/pinctrl/samsung/pinctrl-s3c24xx.c
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
--- a/drivers/staging/rdma/Kconfig
+++ b/drivers/staging/rdma/Kconfig
--- a/drivers/staging/rdma/Makefile
+++ b/drivers/staging/rdma/Makefile
--- a/drivers/infiniband/hw/ehca/Kconfig
+++ b/drivers/infiniband/hw/ehca/Kconfig
--- a/drivers/infiniband/hw/ehca/Makefile
+++ b/drivers/infiniband/hw/ehca/Makefile
--- a/drivers/staging/rdma/ehca/TODO
+++ b/drivers/staging/rdma/ehca/TODO
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
--- a/drivers/infiniband/hw/ehca/ehca_classes_pSeries.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes_pSeries.h
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
--- a/drivers/infiniband/hw/ehca/ehca_eq.c
+++ b/drivers/infiniband/hw/ehca/ehca_eq.c
--- a/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/drivers/infiniband/hw/ehca/ehca_hca.c
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
--- a/drivers/infiniband/hw/ehca/ehca_irq.h
+++ b/drivers/infiniband/hw/ehca/ehca_irq.h
--- a/drivers/infiniband/hw/ehca/ehca_iverbs.h
+++ b/drivers/infiniband/hw/ehca/ehca_iverbs.h
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
--- a/drivers/infiniband/hw/ehca/ehca_mcast.c
+++ b/drivers/infiniband/hw/ehca/ehca_mcast.c
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.h
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.h
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
--- a/drivers/infiniband/hw/ehca/ehca_qes.h
+++ b/drivers/infiniband/hw/ehca/ehca_qes.h
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
--- a/drivers/infiniband/hw/ehca/ehca_sqp.c
+++ b/drivers/infiniband/hw/ehca/ehca_sqp.c
--- a/drivers/infiniband/hw/ehca/ehca_tools.h
+++ b/drivers/infiniband/hw/ehca/ehca_tools.h
--- a/drivers/infiniband/hw/ehca/ehca_uverbs.c
+++ b/drivers/infiniband/hw/ehca/ehca_uverbs.c
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
--- a/drivers/infiniband/hw/ehca/hcp_if.h
+++ b/drivers/infiniband/hw/ehca/hcp_if.h
--- a/drivers/infiniband/hw/ehca/hcp_phyp.c
+++ b/drivers/infiniband/hw/ehca/hcp_phyp.c
--- a/drivers/infiniband/hw/ehca/hcp_phyp.h
+++ b/drivers/infiniband/hw/ehca/hcp_phyp.h
--- a/drivers/infiniband/hw/ehca/hipz_fns.h
+++ b/drivers/infiniband/hw/ehca/hipz_fns.h
--- a/Show more
+++ b/Show more