Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-24 18:16:04 +00:00 · 2008-07-13 22:52:27 +02:00 · 2008-07-13 22:52:27 +02:00 · dbbcfb2211
commit dbbcfb2211
parent b0356cd0e7 9df2fe9867
115 changed files with 2221 additions and 386 deletions
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/4
+++ b/4
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
--- a/arch/mips/mm/page.c
+++ b/arch/mips/mm/page.c
--- a/arch/mips/mm/sc-rm7k.c
+++ b/arch/mips/mm/sc-rm7k.c
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
--- a/arch/x86/kernel/.gitignore
+++ b/arch/x86/kernel/.gitignore
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
--- a/block/bsg.c
+++ b/block/bsg.c
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
--- a/drivers/rapidio/rio-driver.c
+++ b/drivers/rapidio/rio-driver.c
--- a/drivers/rtc/rtc-fm3130.c
+++ b/drivers/rtc/rtc-fm3130.c
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
--- a/include/asm-avr32/setup.h
+++ b/include/asm-avr32/setup.h
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
--- a/include/asm-powerpc/hugetlb.h
+++ b/include/asm-powerpc/hugetlb.h
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/include/asm-powerpc/pgtable-ppc64.h
--- a/include/asm-s390/pgtable.h
+++ b/include/asm-s390/pgtable.h
--- a/include/asm-x86/desc.h
+++ b/include/asm-x86/desc.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
--- a/kernel/printk.c
+++ b/kernel/printk.c
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
--- a/mm/slub.c
+++ b/mm/slub.c
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
--- a/net/can/raw.c
+++ b/net/can/raw.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
--- a/Show more
+++ b/Show more