Merge branch 'linus' into perf/core

Conflicts: tools/perf/Makefile tools/perf/builtin-test.c tools/perf/perf.h tools/perf/tests/parse-events.c tools/perf/util/evsel.h Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-10-26 19:14:18 +00:00 · 2012-12-08 15:25:06 +01:00 · 2012-12-08 15:25:06 +01:00 · f0b9abfb04
commit f0b9abfb04
parent adc1ef1e37 1b3c393cd4
1120 changed files with 13815 additions and 8556 deletions
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/linux/bug.h
+++ b/include/linux/bug.h
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/hashtable.h
+++ b/include/linux/hashtable.h
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
--- a/include/linux/i2c-omap.h
+++ b/include/linux/i2c-omap.h
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
--- a/include/linux/percpu-rwsem.h
+++ b/include/linux/percpu-rwsem.h
--- a/include/linux/platform_data/omap_ocp2scp.h
+++ b/include/linux/platform_data/omap_ocp2scp.h
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
--- a/include/linux/raid/Kbuild
+++ b/include/linux/raid/Kbuild
--- a/include/linux/raid/md_u.h
+++ b/include/linux/raid/md_u.h
--- a/include/linux/rbtree_augmented.h
+++ b/include/linux/rbtree_augmented.h
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
--- a/include/linux/spi/tsc2005.h
+++ b/include/linux/spi/tsc2005.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/media/adv7604.h
+++ b/include/media/adv7604.h
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
--- a/include/sound/core.h
+++ b/include/sound/core.h
--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
--- a/include/uapi/linux/eventpoll.h
+++ b/include/uapi/linux/eventpoll.h
--- a/include/uapi/linux/hw_breakpoint.h
+++ b/include/uapi/linux/hw_breakpoint.h
--- a/include/uapi/linux/oom.h
+++ b/include/uapi/linux/oom.h
--- a/include/uapi/linux/raid/Kbuild
+++ b/include/uapi/linux/raid/Kbuild
--- a/include/uapi/linux/raid/md_p.h
+++ b/include/uapi/linux/raid/md_p.h
--- a/include/uapi/linux/raid/md_u.h
+++ b/include/uapi/linux/raid/md_u.h
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
--- a/include/xen/hvm.h
+++ b/include/xen/hvm.h