Merge branch 'linus' into perf/core, to fix conflicts

Conflicts: arch/x86/kernel/cpu/perf_event_intel_uncore*.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-13 07:31:07 +00:00 · 2014-08-24 22:32:24 +02:00 · 2014-08-24 22:32:24 +02:00 · 83bc90e115
commit 83bc90e115
parent e21ded5ecc 451fd72219
9233 changed files with 567597 additions and 635098 deletions
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
--- a/include/acpi/platform/aclinuxex.h
+++ b/include/acpi/platform/aclinuxex.h
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
--- a/include/asm-generic/pci-dma-compat.h
+++ b/include/asm-generic/pci-dma-compat.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/clocksource/pxa.h
+++ b/include/clocksource/pxa.h
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_mipi_dsi.h
+++ b/include/drm/drm_mipi_dsi.h
--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
--- a/include/drm/drm_rect.h
+++ b/include/drm/drm_rect.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/dt-bindings/clock/imx1-clock.h
+++ b/include/dt-bindings/clock/imx1-clock.h
--- a/include/dt-bindings/clock/imx21-clock.h
+++ b/include/dt-bindings/clock/imx21-clock.h
--- a/include/dt-bindings/clock/imx27-clock.h
+++ b/include/dt-bindings/clock/imx27-clock.h
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
--- a/include/dt-bindings/clock/s5pv210-audss.h
+++ b/include/dt-bindings/clock/s5pv210-audss.h
--- a/include/dt-bindings/clock/s5pv210.h
+++ b/include/dt-bindings/clock/s5pv210.h
--- a/include/dt-bindings/clock/vf610-clock.h
+++ b/include/dt-bindings/clock/vf610-clock.h
--- a/include/dt-bindings/dma/nbpfaxi.h
+++ b/include/dt-bindings/dma/nbpfaxi.h
--- a/include/dt-bindings/mfd/as3722.h
+++ b/include/dt-bindings/mfd/as3722.h
--- a/include/dt-bindings/phy/phy-miphy365x.h
+++ b/include/dt-bindings/phy/phy-miphy365x.h
--- a/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
+++ b/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
--- a/include/keys/big_key-type.h
+++ b/include/keys/big_key-type.h
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/amd-iommu.h
+++ b/include/linux/amd-iommu.h
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
--- a/include/linux/atmel-pwm-bl.h
+++ b/include/linux/atmel-pwm-bl.h
--- a/include/linux/atmel-ssc.h
+++ b/include/linux/atmel-ssc.h
--- a/include/linux/atmel_pwm.h
+++ b/include/linux/atmel_pwm.h
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
--- a/include/linux/bcma/bcma_driver_pcie2.h
+++ b/include/linux/bcma/bcma_driver_pcie2.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
--- a/include/linux/byteorder/generic.h
+++ b/include/linux/byteorder/generic.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
--- a/include/linux/component.h
+++ b/include/linux/component.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/decompress/bunzip2.h
+++ b/include/linux/decompress/bunzip2.h
--- a/include/linux/decompress/generic.h
+++ b/include/linux/decompress/generic.h
--- a/include/linux/decompress/inflate.h
+++ b/include/linux/decompress/inflate.h
--- a/include/linux/decompress/unlz4.h
+++ b/include/linux/decompress/unlz4.h
--- a/include/linux/decompress/unlzma.h
+++ b/include/linux/decompress/unlzma.h
--- a/include/linux/decompress/unlzo.h
+++ b/include/linux/decompress/unlzo.h
--- a/include/linux/decompress/unxz.h
+++ b/include/linux/decompress/unxz.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
--- a/include/linux/dma-contiguous.h
+++ b/include/linux/dma-contiguous.h
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
--- a/include/linux/extcon/sm5502.h
+++ b/include/linux/extcon/sm5502.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fence.h
+++ b/include/linux/fence.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fs_pin.h
+++ b/include/linux/fs_pin.h
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/glob.h
+++ b/include/linux/glob.h
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
--- a/Show more
+++ b/Show more