Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-09-28 19:20:30 +00:00 · 2014-04-18 12:14:55 +02:00 · 2014-04-18 12:14:55 +02:00 · 1111b680d3
commit 1111b680d3
parent 37b6cb475a 2422365780
124 changed files with 2497 additions and 1941 deletions
--- a/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
--- a/arch/ia64/kvm/vmm_ivt.S
+++ b/arch/ia64/kvm/vmm_ivt.S
--- a/arch/s390/include/asm/sigp.h
+++ b/arch/s390/include/asm/sigp.h
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
--- a/arch/s390/include/uapi/asm/unistd.h
+++ b/arch/s390/include/uapi/asm/unistd.h
--- a/arch/s390/kernel/compat_wrapper.c
+++ b/arch/s390/kernel/compat_wrapper.c
--- a/arch/s390/kernel/dumpstack.c
+++ b/arch/s390/kernel/dumpstack.c
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
--- a/arch/x86/kvm/cpuid.h
+++ b/arch/x86/kvm/cpuid.h
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/syscalls/Makefile
+++ b/arch/x86/syscalls/Makefile
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
--- a/drivers/char/hw_random/bcm2835-rng.c
+++ b/drivers/char/hw_random/bcm2835-rng.c
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
--- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
--- a/drivers/pinctrl/pinctrl-bcm281xx.c
+++ b/drivers/pinctrl/pinctrl-bcm281xx.c
--- a/drivers/pinctrl/pinctrl-capri.c
+++ b/drivers/pinctrl/pinctrl-capri.c
--- a/drivers/pinctrl/pinctrl-msm.c
+++ b/drivers/pinctrl/pinctrl-msm.c
--- a/drivers/pinctrl/pinctrl-msm.h
+++ b/drivers/pinctrl/pinctrl-msm.h
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
--- a/drivers/video/omap2/dss/hdmi_common.c
+++ b/drivers/video/omap2/dss/hdmi_common.c
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/netfilter/nf_conntrack_proto_gre.h
+++ b/include/linux/netfilter/nf_conntrack_proto_gre.h
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
--- a/include/net/dst.h
+++ b/include/net/dst.h
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
--- a/include/net/ip.h
+++ b/include/net/ip.h
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/netfilter/nf_tables_core.h
+++ b/include/net/netfilter/nf_tables_core.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/kernel/locking/mutex-debug.c
+++ b/kernel/locking/mutex-debug.c
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/dst.c
+++ b/net/core/dst.c
--- a/net/core/filter.c
+++ b/net/core/filter.c
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv4/xfrm4_output.c
+++ b/net/ipv4/xfrm4_output.c
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
--- a/Show more
+++ b/Show more