Merge branch 'linus' into tracing/core

Conflicts: include/linux/module.h kernel/module.c Semantic conflict: include/trace/events/module.h Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up possibly racy module refcounting") Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-10-16 22:39:48 +00:00 · 2010-04-08 09:06:12 +02:00 · 2010-04-08 09:06:12 +02:00 · c1ab9cab75
commit c1ab9cab75
parent ff0ff84a07 f5284e7635
4461 changed files with 23861 additions and 4342 deletions
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_mem_util.h
+++ b/include/drm/drm_mem_util.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
--- a/include/linux/amba/pl061.h
+++ b/include/linux/amba/pl061.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
--- a/include/linux/wimax/debug.h
+++ b/include/linux/wimax/debug.h
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/x25.h
+++ b/include/net/x25.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
--- a/include/sound/ak4113.h
+++ b/include/sound/ak4113.h
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h