diff --git a/debian/changelog b/debian/changelog index f6590c32b..56b05d7f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -linux-2.6 (2.6.14-2) unstable; urgency=low +linux-2.6 (2.6.14-2) UNRELEASED; urgency=low + [ Simon Horman ] * [SECURITY] Avoid 'names_cache' memory leak with CONFIG_AUDITSYSCALL - This fix, included as part of the 2.6.13.4 patch in + This fix, included as part of the 2.6.13.4 patch in 2.6.13+2.6.14-rc4-0experimental.1 is CVE-2005-3181 - -- Simon Horman Fri, 28 Oct 2005 18:21:00 +0900 + [ dann frazier ] + * Update hppa.diff to 2.6.14-pa0 + + -- dann frazier Fri, 28 Oct 2005 08:56:10 -0600 linux-2.6 (2.6.14-1) unstable; urgency=low diff --git a/debian/patches-arch/hppa.diff b/debian/patches-arch/hppa.diff index 735badc27..12804da58 100644 --- a/debian/patches-arch/hppa.diff +++ b/debian/patches-arch/hppa.diff @@ -1,6 +1,6 @@ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/CREDITS CVS2_6_14_RC2_PA6/CREDITS ---- LINUS_2_6_14_RC2/CREDITS 2005-09-22 19:16:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/CREDITS 2005-09-23 21:43:12.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/CREDITS CVS2_6_14_PA0/CREDITS +--- LINUS_2_6_14/CREDITS 2005-10-27 21:30:30.000000000 -0600 ++++ CVS2_6_14_PA0/CREDITS 2005-10-27 15:47:36.000000000 -0600 @@ -611,8 +611,7 @@ N: Randolph Chung E: tausq@debian.org @@ -11,9 +11,25 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd N: Juan Jose Ciarlante W: http://juanjox.kernelnotes.org/ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/Documentation/parisc/todo CVS2_6_14_RC2_PA6/Documentation/parisc/todo ---- LINUS_2_6_14_RC2/Documentation/parisc/todo 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/Documentation/parisc/todo 2005-04-27 00:45:20.000000000 -0600 +@@ -3399,6 +3398,15 @@ + S: 10200 Prague 10, Hostivar + S: Czech Republic + ++N: Thibaut Varene ++E: T-Bone@parisc-linux.org ++W: http://www.parisc-linux.org/ ++P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063 ++D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits ++D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there ++D: AD1889 sound driver ++S: Paris, France ++ + N: Heikki Vatiainen + E: hessu@cs.tut.fi + D: Co-author of Multi-Protocol Over ATM (MPOA), some LANE hacks +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/Documentation/parisc/todo CVS2_6_14_PA0/Documentation/parisc/todo +--- LINUS_2_6_14/Documentation/parisc/todo 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/Documentation/parisc/todo 2005-04-27 00:45:20.000000000 -0600 @@ -0,0 +1,82 @@ +Status 2005-03-07 : +------------------- @@ -97,9 +113,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + - fix HIL problem: ksoftirqd/0 eats 56% cpu (kernel 2.4 & kernel 2.6) + - NPTL kernel support (CLONE_*TID flags need to be correctly handled by + sys_clone() and friends) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/MAINTAINERS CVS2_6_14_RC2_PA6/MAINTAINERS ---- LINUS_2_6_14_RC2/MAINTAINERS 2005-09-22 19:16:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/MAINTAINERS 2005-09-23 21:43:12.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/MAINTAINERS CVS2_6_14_PA0/MAINTAINERS +--- LINUS_2_6_14/MAINTAINERS 2005-10-27 21:30:30.000000000 -0600 ++++ CVS2_6_14_PA0/MAINTAINERS 2005-10-20 08:42:21.000000000 -0600 @@ -197,6 +197,15 @@ W: http://linux.thorsten-knabe.de S: Maintained @@ -116,9 +132,21 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ADM1025 HARDWARE MONITOR DRIVER P: Jean Delvare M: khali@linux-fr.org -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/ia64/ia32/ia32_signal.c CVS2_6_14_RC2_PA6/arch/ia64/ia32/ia32_signal.c ---- LINUS_2_6_14_RC2/arch/ia64/ia32/ia32_signal.c 2005-09-22 19:17:00.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/ia64/ia32/ia32_signal.c 2005-09-14 06:54:22.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/Makefile CVS2_6_14_PA0/Makefile +--- LINUS_2_6_14/Makefile 2005-10-27 21:30:30.000000000 -0600 ++++ CVS2_6_14_PA0/Makefile 2005-10-27 21:38:35.000000000 -0600 +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 14 +-EXTRAVERSION = ++EXTRAVERSION = -pa0 + NAME=Affluent Albatross + + # *DOCUMENTATION* +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/ia64/ia32/ia32_signal.c CVS2_6_14_PA0/arch/ia64/ia32/ia32_signal.c +--- LINUS_2_6_14/arch/ia64/ia32/ia32_signal.c 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/ia64/ia32/ia32_signal.c 2005-09-14 06:54:22.000000000 -0600 @@ -24,6 +24,7 @@ #include #include @@ -127,9 +155,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #include #include -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/ia64/ia32/ia32priv.h CVS2_6_14_RC2_PA6/arch/ia64/ia32/ia32priv.h ---- LINUS_2_6_14_RC2/arch/ia64/ia32/ia32priv.h 2005-09-22 19:17:00.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/ia64/ia32/ia32priv.h 2005-04-12 14:38:26.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/ia64/ia32/ia32priv.h CVS2_6_14_PA0/arch/ia64/ia32/ia32priv.h +--- LINUS_2_6_14/arch/ia64/ia32/ia32priv.h 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/ia64/ia32/ia32priv.h 2005-04-12 14:38:26.000000000 -0600 @@ -225,58 +225,6 @@ unsigned int st_ino_hi; }; @@ -189,9 +217,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd struct old_linux32_dirent { u32 d_ino; u32 d_offset; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/Kconfig CVS2_6_14_RC2_PA6/arch/parisc/Kconfig ---- LINUS_2_6_14_RC2/arch/parisc/Kconfig 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/Kconfig 2005-09-24 17:20:57.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/Kconfig CVS2_6_14_PA0/arch/parisc/Kconfig +--- LINUS_2_6_14/arch/parisc/Kconfig 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/Kconfig 2005-09-24 17:20:57.000000000 -0600 @@ -47,10 +47,10 @@ config ISA_DMA_API @@ -220,9 +248,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd source "mm/Kconfig" config PREEMPT -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/Makefile CVS2_6_14_RC2_PA6/arch/parisc/Makefile ---- LINUS_2_6_14_RC2/arch/parisc/Makefile 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/Makefile 2005-09-14 13:53:57.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/Makefile CVS2_6_14_PA0/arch/parisc/Makefile +--- LINUS_2_6_14/arch/parisc/Makefile 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/Makefile 2005-09-14 13:53:57.000000000 -0600 @@ -20,7 +20,8 @@ CHECKFLAGS += -D__hppa__=1 @@ -257,16 +285,16 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Without this, "ld -r" results in .text sections that are too big # (> 0x40000) for branches to reach stubs. -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/configs/712_defconfig CVS2_6_14_RC2_PA6/arch/parisc/configs/712_defconfig ---- LINUS_2_6_14_RC2/arch/parisc/configs/712_defconfig 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/configs/712_defconfig 2005-07-18 12:46:03.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/configs/712_defconfig CVS2_6_14_PA0/arch/parisc/configs/712_defconfig +--- LINUS_2_6_14/arch/parisc/configs/712_defconfig 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/configs/712_defconfig 2005-10-21 21:16:47.000000000 -0600 @@ -1,12 +1,16 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-pa5 -# Wed Jan 5 13:20:32 2005 -+# Linux kernel version: 2.6.12-rc4-pa2 -+# Wed May 11 23:02:52 2005 ++# Linux kernel version: 2.6.14-rc5-pa1 ++# Fri Oct 21 23:04:34 2005 # CONFIG_PARISC=y CONFIG_MMU=y @@ -275,11 +303,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_ISA_DMA_API=y ++CONFIG_ARCH_MAY_HAVE_PC_FDC=y # # Code maturity level options -@@ -15,6 +19,7 @@ +@@ -15,35 +19,40 @@ # CONFIG_CLEAN_COMPILE is not set CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y @@ -287,7 +315,12 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # General setup -@@ -26,7 +31,6 @@ + # + CONFIG_LOCALVERSION="" ++# CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set @@ -295,7 +328,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y -@@ -35,15 +39,18 @@ + CONFIG_IKCONFIG_PROC=y ++CONFIG_INITRAMFS_SOURCE="" + # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -315,17 +350,28 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Loadable module support -@@ -65,9 +72,7 @@ +@@ -65,9 +74,18 @@ # CONFIG_PA7300LC is not set # CONFIG_PA8X00 is not set CONFIG_PA11=y -# CONFIG_64BIT is not set # CONFIG_SMP is not set -# CONFIG_DISCONTIGMEM is not set ++# CONFIG_HZ_100 is not set ++CONFIG_HZ_250=y ++# CONFIG_HZ_1000 is not set ++CONFIG_HZ=250 ++CONFIG_SELECT_MEMORY_MODEL=y ++CONFIG_FLATMEM_MANUAL=y ++# CONFIG_DISCONTIGMEM_MANUAL is not set ++# CONFIG_SPARSEMEM_MANUAL is not set ++CONFIG_FLATMEM=y ++CONFIG_FLAT_NODE_MEM_MAP=y ++# CONFIG_SPARSEMEM_STATIC is not set # CONFIG_PREEMPT is not set # CONFIG_HPUX is not set -@@ -81,8 +86,6 @@ +@@ -81,8 +99,6 @@ # CONFIG_GSC_WAX is not set # CONFIG_EISA is not set # CONFIG_PCI is not set @@ -334,7 +380,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # PCCARD (PCMCIA/CardBus) support -@@ -90,12 +93,15 @@ +@@ -90,12 +106,15 @@ # CONFIG_PCCARD is not set # @@ -352,59 +398,215 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Executable file formats -@@ -125,11 +131,9 @@ +@@ -104,137 +123,7 @@ + CONFIG_BINFMT_MISC=m + # - CONFIG_PARPORT=y - CONFIG_PARPORT_PC=m +-# Device Drivers +-# +- +-# +-# Generic Driver Options +-# +-# CONFIG_STANDALONE is not set +-# CONFIG_PREVENT_FIRMWARE_BUILD is not set +-CONFIG_FW_LOADER=y +-# CONFIG_DEBUG_DRIVER is not set +- +-# +-# Memory Technology Devices (MTD) +-# +-# CONFIG_MTD is not set +- +-# +-# Parallel port support +-# +-CONFIG_PARPORT=y +-CONFIG_PARPORT_PC=m -CONFIG_PARPORT_PC_CML1=m - # CONFIG_PARPORT_PC_FIFO is not set - # CONFIG_PARPORT_PC_SUPERIO is not set - CONFIG_PARPORT_GSC=y +-# CONFIG_PARPORT_PC_FIFO is not set +-# CONFIG_PARPORT_PC_SUPERIO is not set +-CONFIG_PARPORT_GSC=y -# CONFIG_PARPORT_OTHER is not set - # CONFIG_PARPORT_1284 is not set - - # -@@ -141,6 +145,7 @@ - # - # CONFIG_BLK_DEV_FD is not set - # CONFIG_PARIDE is not set -+# CONFIG_BLK_DEV_COW_COMMON is not set - CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_CRYPTOLOOP=y - # CONFIG_BLK_DEV_NBD is not set -@@ -158,6 +163,7 @@ - CONFIG_IOSCHED_AS=y - CONFIG_IOSCHED_DEADLINE=y - CONFIG_IOSCHED_CFQ=y -+CONFIG_ATA_OVER_ETH=m - - # - # ATA/ATAPI/MFM/RLL support -@@ -192,6 +198,7 @@ - # - CONFIG_SCSI_SPI_ATTRS=y - # CONFIG_SCSI_FC_ATTRS is not set -+CONFIG_SCSI_ISCSI_ATTRS=m - - # - # SCSI low-level drivers -@@ -200,7 +207,6 @@ - # CONFIG_SCSI_PPA is not set - # CONFIG_SCSI_IMM is not set - CONFIG_SCSI_LASI700=y +-# CONFIG_PARPORT_1284 is not set +- +-# +-# Plug and Play support +-# +- +-# +-# Block devices +-# +-# CONFIG_BLK_DEV_FD is not set +-# CONFIG_PARIDE is not set +-CONFIG_BLK_DEV_LOOP=y +-CONFIG_BLK_DEV_CRYPTOLOOP=y +-# CONFIG_BLK_DEV_NBD is not set +-CONFIG_BLK_DEV_RAM=y +-CONFIG_BLK_DEV_RAM_COUNT=16 +-CONFIG_BLK_DEV_RAM_SIZE=6144 +-CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="" +-# CONFIG_CDROM_PKTCDVD is not set +- +-# +-# IO Schedulers +-# +-CONFIG_IOSCHED_NOOP=y +-CONFIG_IOSCHED_AS=y +-CONFIG_IOSCHED_DEADLINE=y +-CONFIG_IOSCHED_CFQ=y +- +-# +-# ATA/ATAPI/MFM/RLL support +-# +-# CONFIG_IDE is not set +- +-# +-# SCSI device support +-# +-CONFIG_SCSI=y +-CONFIG_SCSI_PROC_FS=y +- +-# +-# SCSI support type (disk, tape, CD-ROM) +-# +-CONFIG_BLK_DEV_SD=y +-CONFIG_CHR_DEV_ST=y +-# CONFIG_CHR_DEV_OSST is not set +-CONFIG_BLK_DEV_SR=y +-# CONFIG_BLK_DEV_SR_VENDOR is not set +-CONFIG_CHR_DEV_SG=y +- +-# +-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +-# +-# CONFIG_SCSI_MULTI_LUN is not set +-# CONFIG_SCSI_CONSTANTS is not set +-# CONFIG_SCSI_LOGGING is not set +- +-# +-# SCSI Transport Attributes +-# +-CONFIG_SCSI_SPI_ATTRS=y +-# CONFIG_SCSI_FC_ATTRS is not set +- +-# +-# SCSI low-level drivers +-# +-# CONFIG_SCSI_SATA is not set +-# CONFIG_SCSI_PPA is not set +-# CONFIG_SCSI_IMM is not set +-CONFIG_SCSI_LASI700=y -CONFIG_53C700_MEM_MAPPED=y - CONFIG_53C700_LE_ON_BE=y - # CONFIG_SCSI_ZALON is not set - CONFIG_SCSI_DEBUG=m -@@ -243,7 +249,6 @@ +-CONFIG_53C700_LE_ON_BE=y +-# CONFIG_SCSI_ZALON is not set +-CONFIG_SCSI_DEBUG=m +- +-# +-# Multi-device support (RAID and LVM) +-# +-CONFIG_MD=y +-CONFIG_BLK_DEV_MD=m +-CONFIG_MD_LINEAR=m +-CONFIG_MD_RAID0=m +-CONFIG_MD_RAID1=m +-# CONFIG_MD_RAID10 is not set +-# CONFIG_MD_RAID5 is not set +-# CONFIG_MD_RAID6 is not set +-# CONFIG_MD_MULTIPATH is not set +-# CONFIG_MD_FAULTY is not set +-# CONFIG_BLK_DEV_DM is not set +- +-# +-# Fusion MPT device support +-# +- +-# +-# IEEE 1394 (FireWire) support +-# +-# CONFIG_IEEE1394 is not set +- +-# +-# I2O device support +-# +- +-# +-# Networking support ++# Networking + # + CONFIG_NET=y + +@@ -243,12 +132,14 @@ # CONFIG_PACKET=y CONFIG_PACKET_MMAP=y -CONFIG_NETLINK_DEV=y CONFIG_UNIX=y ++CONFIG_XFRM=y ++CONFIG_XFRM_USER=m CONFIG_NET_KEY=m CONFIG_INET=y -@@ -321,7 +326,6 @@ + CONFIG_IP_MULTICAST=y + # CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_FIB_HASH=y + CONFIG_IP_PNP=y + CONFIG_IP_PNP_DHCP=y + CONFIG_IP_PNP_BOOTP=y +@@ -262,8 +153,10 @@ + CONFIG_INET_ESP=m + # CONFIG_INET_IPCOMP is not set + CONFIG_INET_TUNNEL=m +-CONFIG_IP_TCPDIAG=y +-# CONFIG_IP_TCPDIAG_IPV6 is not set ++CONFIG_INET_DIAG=m ++CONFIG_INET_TCP_DIAG=m ++# CONFIG_TCP_CONG_ADVANCED is not set ++CONFIG_TCP_CONG_BIC=y + + # + # IP: Virtual Server Configuration +@@ -272,6 +165,7 @@ + # CONFIG_IPV6 is not set + CONFIG_NETFILTER=y + # CONFIG_NETFILTER_DEBUG is not set ++# CONFIG_NETFILTER_NETLINK is not set + + # + # IP: Netfilter Configuration +@@ -279,11 +173,14 @@ + CONFIG_IP_NF_CONNTRACK=m + # CONFIG_IP_NF_CT_ACCT is not set + CONFIG_IP_NF_CONNTRACK_MARK=y ++# CONFIG_IP_NF_CONNTRACK_EVENTS is not set + CONFIG_IP_NF_CT_PROTO_SCTP=m + CONFIG_IP_NF_FTP=m + CONFIG_IP_NF_IRC=m ++# CONFIG_IP_NF_NETBIOS_NS is not set + CONFIG_IP_NF_TFTP=m + CONFIG_IP_NF_AMANDA=m ++# CONFIG_IP_NF_PPTP is not set + CONFIG_IP_NF_QUEUE=m + CONFIG_IP_NF_IPTABLES=m + CONFIG_IP_NF_MATCH_LIMIT=m +@@ -307,21 +204,23 @@ + # CONFIG_IP_NF_MATCH_ADDRTYPE is not set + # CONFIG_IP_NF_MATCH_REALM is not set + CONFIG_IP_NF_MATCH_SCTP=m ++# CONFIG_IP_NF_MATCH_DCCP is not set + CONFIG_IP_NF_MATCH_COMMENT=m + CONFIG_IP_NF_MATCH_CONNMARK=m + CONFIG_IP_NF_MATCH_HASHLIMIT=m ++# CONFIG_IP_NF_MATCH_STRING is not set + CONFIG_IP_NF_FILTER=m + CONFIG_IP_NF_TARGET_REJECT=m + CONFIG_IP_NF_TARGET_LOG=m + CONFIG_IP_NF_TARGET_ULOG=m + CONFIG_IP_NF_TARGET_TCPMSS=m ++# CONFIG_IP_NF_TARGET_NFQUEUE is not set + CONFIG_IP_NF_NAT=m + CONFIG_IP_NF_NAT_NEEDED=y + CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_SAME=m @@ -412,24 +614,233 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_IP_NF_NAT_SNMP_BASIC=m CONFIG_IP_NF_NAT_IRC=m CONFIG_IP_NF_NAT_FTP=m -@@ -340,8 +344,6 @@ +@@ -333,6 +232,7 @@ + CONFIG_IP_NF_TARGET_DSCP=m + CONFIG_IP_NF_TARGET_MARK=m + CONFIG_IP_NF_TARGET_CLASSIFY=m ++# CONFIG_IP_NF_TARGET_TTL is not set + CONFIG_IP_NF_TARGET_CONNMARK=m + CONFIG_IP_NF_TARGET_CLUSTERIP=m + CONFIG_IP_NF_RAW=m +@@ -340,10 +240,11 @@ CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -# CONFIG_IP_NF_COMPAT_IPCHAINS is not set -# CONFIG_IP_NF_COMPAT_IPFWADM is not set - CONFIG_XFRM=y - CONFIG_XFRM_USER=m +-CONFIG_XFRM=y +-CONFIG_XFRM_USER=m ++ ++# ++# DCCP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_DCCP is not set -@@ -383,7 +385,6 @@ + # + # SCTP Configuration (EXPERIMENTAL) +@@ -362,10 +263,6 @@ + # CONFIG_NET_DIVERT is not set + # CONFIG_ECONET is not set + # CONFIG_WAN_ROUTER is not set +- +-# +-# QoS and/or fair queueing +-# + # CONFIG_NET_SCHED is not set + # CONFIG_NET_CLS_ROUTE is not set + +@@ -373,17 +270,162 @@ + # Network testing + # + CONFIG_NET_PKTGEN=m +-# CONFIG_NETPOLL is not set +-# CONFIG_NET_POLL_CONTROLLER is not set + # CONFIG_HAMRADIO is not set + # CONFIG_IRDA is not set + # CONFIG_BT is not set ++# CONFIG_IEEE80211 is not set ++ ++# ++# Device Drivers ++# ++ ++# ++# Generic Driver Options ++# ++# CONFIG_STANDALONE is not set ++# CONFIG_PREVENT_FIRMWARE_BUILD is not set ++CONFIG_FW_LOADER=y ++# CONFIG_DEBUG_DRIVER is not set ++ ++# ++# Connector - unified userspace <-> kernelspace linker ++# ++# CONFIG_CONNECTOR is not set ++ ++# ++# Memory Technology Devices (MTD) ++# ++# CONFIG_MTD is not set ++ ++# ++# Parallel port support ++# ++CONFIG_PARPORT=y ++CONFIG_PARPORT_PC=m ++# CONFIG_PARPORT_PC_FIFO is not set ++# CONFIG_PARPORT_PC_SUPERIO is not set ++CONFIG_PARPORT_GSC=y ++# CONFIG_PARPORT_1284 is not set ++ ++# ++# Plug and Play support ++# ++ ++# ++# Block devices ++# ++# CONFIG_BLK_DEV_FD is not set ++# CONFIG_PARIDE is not set ++# CONFIG_BLK_DEV_COW_COMMON is not set ++CONFIG_BLK_DEV_LOOP=y ++CONFIG_BLK_DEV_CRYPTOLOOP=y ++# CONFIG_BLK_DEV_NBD is not set ++CONFIG_BLK_DEV_RAM=y ++CONFIG_BLK_DEV_RAM_COUNT=16 ++CONFIG_BLK_DEV_RAM_SIZE=6144 ++CONFIG_BLK_DEV_INITRD=y ++# CONFIG_CDROM_PKTCDVD is not set ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++CONFIG_IOSCHED_AS=y ++CONFIG_IOSCHED_DEADLINE=y ++CONFIG_IOSCHED_CFQ=y ++CONFIG_ATA_OVER_ETH=m ++ ++# ++# ATA/ATAPI/MFM/RLL support ++# ++# CONFIG_IDE is not set ++ ++# ++# SCSI device support ++# ++# CONFIG_RAID_ATTRS is not set ++CONFIG_SCSI=y ++CONFIG_SCSI_PROC_FS=y ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++CONFIG_CHR_DEV_ST=y ++# CONFIG_CHR_DEV_OSST is not set ++CONFIG_BLK_DEV_SR=y ++# CONFIG_BLK_DEV_SR_VENDOR is not set ++CONFIG_CHR_DEV_SG=y ++# CONFIG_CHR_DEV_SCH is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_MULTI_LUN is not set ++# CONFIG_SCSI_CONSTANTS is not set ++# CONFIG_SCSI_LOGGING is not set ++ ++# ++# SCSI Transport Attributes ++# ++CONFIG_SCSI_SPI_ATTRS=y ++# CONFIG_SCSI_FC_ATTRS is not set ++CONFIG_SCSI_ISCSI_ATTRS=m ++# CONFIG_SCSI_SAS_ATTRS is not set ++ ++# ++# SCSI low-level drivers ++# ++# CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_PPA is not set ++# CONFIG_SCSI_IMM is not set ++CONFIG_SCSI_LASI700=y ++CONFIG_53C700_LE_ON_BE=y ++# CONFIG_SCSI_ZALON is not set ++CONFIG_SCSI_DEBUG=m ++ ++# ++# Multi-device support (RAID and LVM) ++# ++CONFIG_MD=y ++CONFIG_BLK_DEV_MD=m ++CONFIG_MD_LINEAR=m ++CONFIG_MD_RAID0=m ++CONFIG_MD_RAID1=m ++# CONFIG_MD_RAID10 is not set ++# CONFIG_MD_RAID5 is not set ++# CONFIG_MD_RAID6 is not set ++# CONFIG_MD_MULTIPATH is not set ++# CONFIG_MD_FAULTY is not set ++# CONFIG_BLK_DEV_DM is not set ++ ++# ++# Fusion MPT device support ++# ++# CONFIG_FUSION is not set ++ ++# ++# IEEE 1394 (FireWire) support ++# ++# CONFIG_IEEE1394 is not set ++ ++# ++# I2O device support ++# ++ ++# ++# Network device support ++# + CONFIG_NETDEVICES=y + CONFIG_DUMMY=m CONFIG_BONDING=m # CONFIG_EQUALIZER is not set CONFIG_TUN=m -# CONFIG_ETHERTAP is not set ++ ++# ++# PHY device support ++# ++# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) -@@ -460,19 +461,6 @@ +@@ -391,6 +433,7 @@ + CONFIG_NET_ETHERNET=y + CONFIG_MII=m + CONFIG_LASI_82596=y ++# CONFIG_NET_POCKET is not set + + # + # Ethernet (1000 Mbit) +@@ -414,6 +457,7 @@ + # + # CONFIG_STRIP is not set + # CONFIG_ATMEL is not set ++# CONFIG_HOSTAP is not set + + # + # Wan interfaces +@@ -431,6 +475,8 @@ + # CONFIG_SLIP is not set + # CONFIG_SHAPER is not set + # CONFIG_NETCONSOLE is not set ++# CONFIG_NETPOLL is not set ++# CONFIG_NET_POLL_CONTROLLER is not set + + # + # ISDN subsystem +@@ -460,19 +506,6 @@ # CONFIG_INPUT_EVBUG is not set # @@ -449,7 +860,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -@@ -483,6 +471,7 @@ +@@ -483,6 +516,7 @@ # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set @@ -457,7 +868,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_KEYBOARD_HIL is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y -@@ -494,6 +483,20 @@ +@@ -494,6 +528,19 @@ # CONFIG_INPUT_MISC is not set # @@ -472,18 +883,25 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set -+CONFIG_SOUND_GAMEPORT=y + +# # Character devices # CONFIG_VT=y -@@ -546,12 +549,15 @@ +@@ -511,7 +558,6 @@ + CONFIG_SERIAL_8250_MANY_PORTS=y + CONFIG_SERIAL_8250_SHARE_IRQ=y + # CONFIG_SERIAL_8250_DETECT_IRQ is not set +-# CONFIG_SERIAL_8250_MULTIPORT is not set + # CONFIG_SERIAL_8250_RSA is not set + + # +@@ -546,12 +592,14 @@ # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set - # CONFIG_DRM is not set +-# CONFIG_DRM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=256 @@ -495,7 +913,28 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # I2C support # # CONFIG_I2C is not set -@@ -579,19 +585,25 @@ +@@ -562,10 +610,20 @@ + # CONFIG_W1 is not set + + # ++# Hardware Monitoring support ++# ++# CONFIG_HWMON is not set ++# CONFIG_HWMON_VID is not set ++ ++# + # Misc devices + # + + # ++# Multimedia Capabilities Port drivers ++# ++ ++# + # Multimedia devices + # + # CONFIG_VIDEO_DEV is not set +@@ -579,28 +637,36 @@ # Graphics support # CONFIG_FB=y @@ -523,7 +962,18 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -@@ -610,6 +622,7 @@ + # CONFIG_FONT_6x11 is not set ++# CONFIG_FONT_7x14 is not set + # CONFIG_FONT_PEARL_8x8 is not set + # CONFIG_FONT_ACORN_8x8 is not set + # CONFIG_FONT_MINI_4x6 is not set + # CONFIG_FONT_SUN8x16 is not set + # CONFIG_FONT_SUN12x22 is not set ++# CONFIG_FONT_10x18 is not set + + # + # Logo configuration +@@ -610,6 +676,7 @@ # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_LOGO_PARISC_CLUT224=y @@ -531,7 +981,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Sound -@@ -657,10 +670,6 @@ +@@ -657,10 +724,6 @@ # CONFIG_USB_ARCH_HAS_OHCI is not set # @@ -542,7 +992,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # USB Gadget Support # # CONFIG_USB_GADGET is not set -@@ -671,6 +680,11 @@ +@@ -671,10 +734,20 @@ # CONFIG_MMC is not set # @@ -550,11 +1000,20 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# +# CONFIG_INFINIBAND is not set + ++# ++# SN Devices ++# ++ +# # File systems # CONFIG_EXT2_FS=y -@@ -682,10 +696,16 @@ + # CONFIG_EXT2_FS_XATTR is not set ++# CONFIG_EXT2_FS_XIP is not set + CONFIG_EXT3_FS=y + # CONFIG_EXT3_FS_XATTR is not set + CONFIG_JBD=y +@@ -682,20 +755,24 @@ # CONFIG_REISERFS_FS is not set CONFIG_JFS_FS=m # CONFIG_JFS_POSIX_ACL is not set @@ -562,16 +1021,69 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -+ -+# -+# XFS support -+# CONFIG_XFS_FS=m +-# CONFIG_XFS_RT is not set +CONFIG_XFS_EXPORT=y - # CONFIG_XFS_RT is not set # CONFIG_XFS_QUOTA is not set # CONFIG_XFS_SECURITY is not set -@@ -838,13 +858,18 @@ + # CONFIG_XFS_POSIX_ACL is not set ++# CONFIG_XFS_RT is not set + # CONFIG_MINIX_FS is not set + # CONFIG_ROMFS_FS is not set ++CONFIG_INOTIFY=y + # CONFIG_QUOTA is not set + CONFIG_DNOTIFY=y + # CONFIG_AUTOFS_FS is not set + CONFIG_AUTOFS4_FS=y ++# CONFIG_FUSE_FS is not set + + # + # CD-ROM/DVD Filesystems +@@ -722,14 +799,11 @@ + CONFIG_PROC_FS=y + CONFIG_PROC_KCORE=y + CONFIG_SYSFS=y +-# CONFIG_DEVFS_FS is not set +-# CONFIG_DEVPTS_FS_XATTR is not set + CONFIG_TMPFS=y +-CONFIG_TMPFS_XATTR=y +-# CONFIG_TMPFS_SECURITY is not set + # CONFIG_HUGETLBFS is not set + # CONFIG_HUGETLB_PAGE is not set + CONFIG_RAMFS=y ++# CONFIG_RELAYFS_FS is not set + + # + # Miscellaneous filesystems +@@ -754,16 +828,19 @@ + # + CONFIG_NFS_FS=y + CONFIG_NFS_V3=y ++# CONFIG_NFS_V3_ACL is not set + CONFIG_NFS_V4=y + CONFIG_NFS_DIRECTIO=y + CONFIG_NFSD=m + CONFIG_NFSD_V3=y ++# CONFIG_NFSD_V3_ACL is not set + CONFIG_NFSD_V4=y + CONFIG_NFSD_TCP=y + CONFIG_ROOT_NFS=y + CONFIG_LOCKD=y + CONFIG_LOCKD_V4=y + CONFIG_EXPORTFS=m ++CONFIG_NFS_COMMON=y + CONFIG_SUNRPC=y + CONFIG_SUNRPC_GSS=y + CONFIG_RPCSEC_GSS_KRB5=y +@@ -778,6 +855,7 @@ + # CONFIG_NCP_FS is not set + # CONFIG_CODA_FS is not set + # CONFIG_AFS_FS is not set ++# CONFIG_9P_FS is not set + + # + # Partition Types +@@ -838,13 +916,19 @@ # # Kernel hacking # @@ -579,6 +1091,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y +CONFIG_LOG_BUF_SHIFT=16 ++CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -590,7 +1103,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Security options -@@ -865,6 +890,7 @@ +@@ -865,6 +949,7 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m @@ -598,7 +1111,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m -@@ -882,6 +908,10 @@ +@@ -882,9 +967,14 @@ CONFIG_CRYPTO_TEST=m # @@ -609,16 +1122,20 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Library routines # CONFIG_CRC_CCITT=m -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/configs/a500_defconfig CVS2_6_14_RC2_PA6/arch/parisc/configs/a500_defconfig ---- LINUS_2_6_14_RC2/arch/parisc/configs/a500_defconfig 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/configs/a500_defconfig 2005-09-24 19:37:20.000000000 -0600 ++# CONFIG_CRC16 is not set + CONFIG_CRC32=y + CONFIG_LIBCRC32C=m + CONFIG_ZLIB_INFLATE=m +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/configs/a500_defconfig CVS2_6_14_PA0/arch/parisc/configs/a500_defconfig +--- LINUS_2_6_14/arch/parisc/configs/a500_defconfig 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/configs/a500_defconfig 2005-10-21 21:16:47.000000000 -0600 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc4-pa1 -# Wed Feb 16 11:32:49 2005 -+# Linux kernel version: 2.6.14-rc2-pa1 -+# Sat Sep 24 18:12:25 2005 ++# Linux kernel version: 2.6.14-rc5-pa1 ++# Fri Oct 21 23:04:54 2005 # CONFIG_PARISC=y CONFIG_MMU=y @@ -710,7 +1227,15 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_CARDBUS=y # -@@ -127,6 +149,201 @@ +@@ -104,7 +126,6 @@ + CONFIG_YENTA=m + CONFIG_PD6729=m + CONFIG_I82092=m +-CONFIG_TCIC=m + CONFIG_PCCARD_NONSTATIC=m + + # +@@ -127,6 +148,203 @@ # CONFIG_BINFMT_MISC is not set # @@ -811,6 +1336,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m ++# CONFIG_IP_NF_TARGET_NFQUEUE is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -858,6 +1384,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m ++# CONFIG_IP6_NF_TARGET_NFQUEUE is not set +CONFIG_IP6_NF_MANGLE=m +# CONFIG_IP6_NF_TARGET_MARK is not set +# CONFIG_IP6_NF_TARGET_HL is not set @@ -912,7 +1439,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Device Drivers # -@@ -139,6 +356,11 @@ +@@ -139,6 +357,11 @@ # CONFIG_DEBUG_DRIVER is not set # @@ -924,7 +1451,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Memory Technology Devices (MTD) # # CONFIG_MTD is not set -@@ -169,7 +391,6 @@ +@@ -169,7 +392,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=6144 CONFIG_BLK_DEV_INITRD=y @@ -932,7 +1459,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_CDROM_PKTCDVD is not set # -@@ -189,6 +410,7 @@ +@@ -189,6 +411,7 @@ # # SCSI device support # @@ -940,7 +1467,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_SCSI=y CONFIG_SCSI_PROC_FS=y -@@ -201,6 +423,7 @@ +@@ -201,6 +424,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=y @@ -948,7 +1475,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs -@@ -215,6 +438,7 @@ +@@ -215,6 +439,7 @@ CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m @@ -956,9 +1483,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # SCSI low-level drivers -@@ -230,13 +454,10 @@ +@@ -229,14 +454,12 @@ + # CONFIG_SCSI_ADVANSYS is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set ++# CONFIG_MEGARAID_SAS is not set # CONFIG_SCSI_SATA is not set -# CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_CPQFCTS is not set @@ -970,7 +1499,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -@@ -246,8 +467,6 @@ +@@ -246,8 +469,6 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_IPR is not set @@ -979,7 +1508,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_QLOGIC_ISP is not set CONFIG_SCSI_QLOGIC_FC=m # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set -@@ -258,7 +477,9 @@ +@@ -258,7 +479,9 @@ # CONFIG_SCSI_QLA22XX is not set CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m @@ -990,7 +1519,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set CONFIG_SCSI_DEBUG=m -@@ -288,8 +509,10 @@ +@@ -288,8 +511,11 @@ # # Fusion MPT device support # @@ -999,11 +1528,12 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m ++# CONFIG_FUSION_SAS is not set +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m # -@@ -303,153 +526,13 @@ +@@ -303,153 +529,13 @@ # CONFIG_I2O is not set # @@ -1158,7 +1688,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ARCnet devices -@@ -457,6 +540,11 @@ +@@ -457,12 +543,18 @@ # CONFIG_ARCNET is not set # @@ -1170,7 +1700,14 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -@@ -479,6 +567,7 @@ + CONFIG_MII=m + # CONFIG_HAPPYMEAL is not set + # CONFIG_SUNGEM is not set ++# CONFIG_CASSINI is not set + CONFIG_NET_VENDOR_3COM=y + CONFIG_VORTEX=m + CONFIG_TYPHOON=m +@@ -479,6 +571,7 @@ # CONFIG_DE4X5 is not set # CONFIG_WINBOND_840 is not set # CONFIG_DM9102 is not set @@ -1178,7 +1715,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_PCMCIA_XIRCOM=m # CONFIG_PCMCIA_XIRTULIP is not set CONFIG_HP100=m -@@ -489,48 +578,43 @@ +@@ -489,48 +582,43 @@ # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_DGRS is not set @@ -1239,7 +1776,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Token Ring devices -@@ -560,6 +644,7 @@ +@@ -560,6 +648,7 @@ CONFIG_HERMES=m CONFIG_PLX_HERMES=m CONFIG_TMD_HERMES=m @@ -1247,7 +1784,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_PCI_HERMES=m # CONFIG_ATMEL is not set -@@ -567,6 +652,7 @@ +@@ -567,6 +656,7 @@ # Wireless 802.11b Pcmcia/Cardbus cards support # CONFIG_PCMCIA_HERMES=m @@ -1255,7 +1792,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_AIRO_CS=m CONFIG_PCMCIA_WL3501=m -@@ -574,6 +660,7 @@ +@@ -574,6 +664,7 @@ # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support # # CONFIG_PRISM54 is not set @@ -1263,7 +1800,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_NET_WIRELESS=y # -@@ -607,6 +694,8 @@ +@@ -607,6 +698,8 @@ # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set @@ -1272,7 +1809,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ISDN subsystem -@@ -633,13 +722,6 @@ +@@ -633,13 +726,6 @@ # CONFIG_INPUT_EVBUG is not set # @@ -1286,7 +1823,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Input Device Drivers # # CONFIG_INPUT_KEYBOARD is not set -@@ -649,6 +731,12 @@ +@@ -649,6 +735,12 @@ # CONFIG_INPUT_MISC is not set # @@ -1299,7 +1836,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Character devices # CONFIG_VT=y -@@ -667,7 +755,6 @@ +@@ -667,7 +759,6 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set @@ -1307,7 +1844,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SERIAL_8250_RSA is not set # -@@ -677,6 +764,7 @@ +@@ -677,6 +768,7 @@ CONFIG_PDC_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -1315,7 +1852,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set -@@ -708,6 +796,11 @@ +@@ -708,6 +800,11 @@ CONFIG_MAX_RAW_DEVS=256 # @@ -1327,7 +1864,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # I2C support # # CONFIG_I2C is not set -@@ -718,10 +811,20 @@ +@@ -718,10 +815,20 @@ # CONFIG_W1 is not set # @@ -1348,7 +1885,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Multimedia devices # # CONFIG_VIDEO_DEV is not set -@@ -742,6 +845,7 @@ +@@ -742,6 +849,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=160 CONFIG_DUMMY_CONSOLE_ROWS=64 @@ -1356,7 +1893,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Sound -@@ -751,13 +855,9 @@ +@@ -751,13 +859,9 @@ # # USB support # @@ -1371,7 +1908,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB Gadget Support -@@ -772,17 +872,18 @@ +@@ -772,17 +876,18 @@ # # InfiniBand support # @@ -1395,7 +1932,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set CONFIG_JBD=y -@@ -794,22 +895,20 @@ +@@ -794,22 +899,20 @@ # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y @@ -1421,7 +1958,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # CD-ROM/DVD Filesystems -@@ -836,13 +935,11 @@ +@@ -836,13 +939,11 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y @@ -1436,7 +1973,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Miscellaneous filesystems -@@ -867,15 +964,18 @@ +@@ -867,15 +968,18 @@ # CONFIG_NFS_FS=m CONFIG_NFS_V3=y @@ -1455,7 +1992,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m -@@ -890,6 +990,7 @@ +@@ -890,6 +994,7 @@ # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1463,7 +2000,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Partition Types -@@ -906,15 +1007,15 @@ +@@ -906,15 +1011,15 @@ # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set CONFIG_NLS_CODEPAGE_850=m @@ -1482,7 +2019,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set -@@ -926,10 +1027,10 @@ +@@ -926,10 +1031,10 @@ # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set @@ -1497,7 +2034,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set -@@ -950,11 +1051,15 @@ +@@ -950,11 +1055,15 @@ # # Kernel hacking # @@ -1513,7 +2050,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_IOREMAP is not set -@@ -974,25 +1079,26 @@ +@@ -974,25 +1083,26 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NULL=m @@ -1555,7 +2092,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_TEST=m -@@ -1004,6 +1110,7 @@ +@@ -1004,6 +1114,7 @@ # Library routines # CONFIG_CRC_CCITT=m @@ -1563,16 +2100,16 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/configs/b180_defconfig CVS2_6_14_RC2_PA6/arch/parisc/configs/b180_defconfig ---- LINUS_2_6_14_RC2/arch/parisc/configs/b180_defconfig 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/configs/b180_defconfig 2005-07-18 12:46:03.000000000 -0600 -@@ -1,12 +1,16 @@ +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/configs/b180_defconfig CVS2_6_14_PA0/arch/parisc/configs/b180_defconfig +--- LINUS_2_6_14/arch/parisc/configs/b180_defconfig 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/configs/b180_defconfig 2005-10-21 21:16:47.000000000 -0600 +@@ -1,12 +1,15 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-pa5 -# Wed Jan 5 13:35:54 2005 -+# Linux kernel version: 2.6.12-rc4-pa2 -+# Wed May 11 23:04:20 2005 ++# Linux kernel version: 2.6.14-rc5-pa1 ++# Fri Oct 21 23:06:10 2005 # CONFIG_PARISC=y CONFIG_MMU=y @@ -1581,11 +2118,10 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_ISA_DMA_API=y # # Code maturity level options -@@ -14,6 +18,7 @@ +@@ -14,33 +17,39 @@ # CONFIG_EXPERIMENTAL is not set CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y @@ -1593,7 +2129,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # General setup -@@ -24,23 +29,26 @@ + # + CONFIG_LOCALVERSION="" ++# CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set @@ -1603,6 +2143,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y ++CONFIG_INITRAMFS_SOURCE="" # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -1623,18 +2164,27 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Loadable module support -@@ -60,7 +68,6 @@ +@@ -60,8 +69,14 @@ # CONFIG_PA7300LC is not set # CONFIG_PA8X00 is not set CONFIG_PA11=y -# CONFIG_64BIT is not set # CONFIG_SMP is not set ++# CONFIG_HZ_100 is not set ++CONFIG_HZ_250=y ++# CONFIG_HZ_1000 is not set ++CONFIG_HZ=250 ++CONFIG_FLATMEM=y ++CONFIG_FLAT_NODE_MEM_MAP=y ++# CONFIG_SPARSEMEM_STATIC is not set # CONFIG_PREEMPT is not set # CONFIG_HPUX is not set -@@ -79,10 +86,25 @@ + +@@ -78,11 +93,25 @@ + CONFIG_ISA=y CONFIG_PCI=y CONFIG_PCI_LEGACY_PROC=y - CONFIG_PCI_NAMES=y +-CONFIG_PCI_NAMES=y +# CONFIG_PCI_DEBUG is not set CONFIG_GSC_DINO=y # CONFIG_PCI_LBA is not set @@ -1657,7 +2207,72 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Executable file formats -@@ -99,6 +121,7 @@ +@@ -91,6 +120,64 @@ + # CONFIG_BINFMT_MISC is not set + + # ++# Networking ++# ++CONFIG_NET=y ++ ++# ++# Networking options ++# ++CONFIG_PACKET=y ++CONFIG_PACKET_MMAP=y ++CONFIG_UNIX=y ++# CONFIG_NET_KEY is not set ++CONFIG_INET=y ++CONFIG_IP_MULTICAST=y ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_FIB_HASH=y ++CONFIG_IP_PNP=y ++# CONFIG_IP_PNP_DHCP is not set ++CONFIG_IP_PNP_BOOTP=y ++# CONFIG_IP_PNP_RARP is not set ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_IP_MROUTE is not set ++# CONFIG_SYN_COOKIES is not set ++# CONFIG_INET_AH is not set ++# CONFIG_INET_ESP is not set ++# CONFIG_INET_IPCOMP is not set ++# CONFIG_INET_TUNNEL is not set ++CONFIG_INET_DIAG=y ++CONFIG_INET_TCP_DIAG=y ++# CONFIG_TCP_CONG_ADVANCED is not set ++CONFIG_TCP_CONG_BIC=y ++CONFIG_IPV6=y ++# CONFIG_IPV6_PRIVACY is not set ++# CONFIG_INET6_AH is not set ++# CONFIG_INET6_ESP is not set ++# CONFIG_INET6_IPCOMP is not set ++# CONFIG_INET6_TUNNEL is not set ++# CONFIG_IPV6_TUNNEL is not set ++# CONFIG_NETFILTER is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_VLAN_8021Q is not set ++# CONFIG_DECNET is not set ++# CONFIG_LLC2 is not set ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_NET_SCHED is not set ++# CONFIG_NET_CLS_ROUTE is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++# CONFIG_HAMRADIO is not set ++# CONFIG_IRDA is not set ++# CONFIG_BT is not set ++# CONFIG_IEEE80211 is not set ++ ++# + # Device Drivers + # + +@@ -99,9 +186,15 @@ # CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set @@ -1665,7 +2280,15 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_DEBUG_DRIVER is not set # -@@ -111,10 +134,8 @@ ++# Connector - unified userspace <-> kernelspace linker ++# ++# CONFIG_CONNECTOR is not set ++ ++# + # Memory Technology Devices (MTD) + # + # CONFIG_MTD is not set +@@ -111,10 +204,8 @@ # CONFIG_PARPORT=y CONFIG_PARPORT_PC=y @@ -1676,7 +2299,13 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_PARPORT_1284 is not set # -@@ -131,6 +152,7 @@ +@@ -125,19 +216,17 @@ + # + # Block devices + # +-# CONFIG_BLK_DEV_FD is not set +-# CONFIG_BLK_DEV_XD is not set + # CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set @@ -1684,7 +2313,14 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y # CONFIG_BLK_DEV_NBD is not set -@@ -149,6 +171,7 @@ + # CONFIG_BLK_DEV_SX8 is not set + # CONFIG_BLK_DEV_RAM is not set + CONFIG_BLK_DEV_RAM_COUNT=16 +-CONFIG_INITRAMFS_SOURCE="" + CONFIG_CDROM_PKTCDVD=m + CONFIG_CDROM_PKTCDVD_BUFFERS=8 + # CONFIG_CDROM_PKTCDVD_WCACHE is not set +@@ -149,6 +238,7 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y @@ -1692,23 +2328,58 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ATA/ATAPI/MFM/RLL support -@@ -183,6 +206,7 @@ +@@ -158,6 +248,7 @@ + # + # SCSI device support + # ++# CONFIG_RAID_ATTRS is not set + CONFIG_SCSI=y + CONFIG_SCSI_PROC_FS=y + +@@ -170,6 +261,7 @@ + CONFIG_BLK_DEV_SR=y + # CONFIG_BLK_DEV_SR_VENDOR is not set + CONFIG_CHR_DEV_SG=y ++# CONFIG_CHR_DEV_SCH is not set + + # + # Some SCSI devices (e.g. CD jukebox) support multiple LUNs +@@ -183,16 +275,16 @@ # CONFIG_SCSI_SPI_ATTRS=y # CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set ++# CONFIG_SCSI_SAS_ATTRS is not set # # SCSI low-level drivers -@@ -207,7 +231,6 @@ + # + # CONFIG_BLK_DEV_3W_XXXX_RAID is not set + # CONFIG_SCSI_3W_9XXX is not set +-# CONFIG_SCSI_7000FASST is not set + # CONFIG_SCSI_ACARD is not set + # CONFIG_SCSI_AHA152X is not set +-# CONFIG_SCSI_AHA1542 is not set + # CONFIG_SCSI_AHA1740 is not set + # CONFIG_SCSI_AACRAID is not set + # CONFIG_SCSI_AIC7XXX is not set +@@ -202,14 +294,11 @@ + # CONFIG_SCSI_IN2000 is not set + # CONFIG_MEGARAID_NEWGEN is not set + # CONFIG_MEGARAID_LEGACY is not set ++# CONFIG_MEGARAID_SAS is not set + # CONFIG_SCSI_SATA is not set +-# CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_DTC3280 is not set - # CONFIG_SCSI_EATA is not set +-# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_EATA_PIO is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set - # CONFIG_SCSI_GDTH is not set +-# CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set -@@ -219,7 +242,6 @@ + # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set + # CONFIG_SCSI_IPS is not set +@@ -219,7 +308,6 @@ # CONFIG_SCSI_IMM is not set # CONFIG_SCSI_NCR53C406A is not set CONFIG_SCSI_LASI700=y @@ -1716,7 +2387,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_53C700_LE_ON_BE=y CONFIG_SCSI_SYM53C8XX_2=y CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 -@@ -231,7 +253,6 @@ +@@ -231,7 +319,6 @@ # CONFIG_SCSI_PAS16 is not set # CONFIG_SCSI_PSI240I is not set # CONFIG_SCSI_QLOGIC_FAS is not set @@ -1724,16 +2395,22 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_QLA2XXX=y -@@ -240,7 +261,7 @@ +@@ -240,12 +327,12 @@ # CONFIG_SCSI_QLA2300 is not set # CONFIG_SCSI_QLA2322 is not set # CONFIG_SCSI_QLA6312 is not set -# CONFIG_SCSI_QLA6322 is not set ++# CONFIG_SCSI_QLA24XX is not set +# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_SIM710 is not set # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC390T is not set -@@ -263,6 +284,7 @@ + # CONFIG_SCSI_T128 is not set +-# CONFIG_SCSI_U14_34F is not set + # CONFIG_SCSI_NSP32 is not set + # CONFIG_SCSI_DEBUG is not set + +@@ -263,6 +350,7 @@ CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y CONFIG_MD_RAID5=y @@ -1741,31 +2418,146 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set # CONFIG_BLK_DEV_DM is not set -@@ -292,7 +314,6 @@ +@@ -271,6 +359,9 @@ + # Fusion MPT device support # - CONFIG_PACKET=y - CONFIG_PACKET_MMAP=y + # CONFIG_FUSION is not set ++# CONFIG_FUSION_SPI is not set ++# CONFIG_FUSION_FC is not set ++# CONFIG_FUSION_SAS is not set + + # + # IEEE 1394 (FireWire) support +@@ -283,58 +374,8 @@ + # CONFIG_I2O is not set + + # +-# Networking support +-# +-CONFIG_NET=y +- +-# +-# Networking options +-# +-CONFIG_PACKET=y +-CONFIG_PACKET_MMAP=y -CONFIG_NETLINK_DEV=y - CONFIG_UNIX=y - # CONFIG_NET_KEY is not set - CONFIG_INET=y -@@ -311,7 +332,14 @@ - # CONFIG_INET_IPCOMP is not set - # CONFIG_INET_TUNNEL is not set - CONFIG_IP_TCPDIAG=y +-CONFIG_UNIX=y +-# CONFIG_NET_KEY is not set +-CONFIG_INET=y +-CONFIG_IP_MULTICAST=y +-# CONFIG_IP_ADVANCED_ROUTER is not set +-CONFIG_IP_PNP=y +-# CONFIG_IP_PNP_DHCP is not set +-CONFIG_IP_PNP_BOOTP=y +-# CONFIG_IP_PNP_RARP is not set +-# CONFIG_NET_IPIP is not set +-# CONFIG_NET_IPGRE is not set +-# CONFIG_IP_MROUTE is not set +-# CONFIG_SYN_COOKIES is not set +-# CONFIG_INET_AH is not set +-# CONFIG_INET_ESP is not set +-# CONFIG_INET_IPCOMP is not set +-# CONFIG_INET_TUNNEL is not set +-CONFIG_IP_TCPDIAG=y -# CONFIG_IP_TCPDIAG_IPV6 is not set -+CONFIG_IP_TCPDIAG_IPV6=y -+CONFIG_IPV6=y -+# CONFIG_IPV6_PRIVACY is not set -+# CONFIG_INET6_AH is not set -+# CONFIG_INET6_ESP is not set -+# CONFIG_INET6_IPCOMP is not set -+# CONFIG_INET6_TUNNEL is not set -+# CONFIG_IPV6_TUNNEL is not set - # CONFIG_NETFILTER is not set - # CONFIG_BRIDGE is not set - # CONFIG_VLAN_8021Q is not set -@@ -464,23 +492,12 @@ +-# CONFIG_NETFILTER is not set +-# CONFIG_BRIDGE is not set +-# CONFIG_VLAN_8021Q is not set +-# CONFIG_DECNET is not set +-# CONFIG_LLC2 is not set +-# CONFIG_IPX is not set +-# CONFIG_ATALK is not set +- +-# +-# QoS and/or fair queueing +-# +-# CONFIG_NET_SCHED is not set +-# CONFIG_NET_CLS_ROUTE is not set +- +-# +-# Network testing ++# Network device support + # +-# CONFIG_NET_PKTGEN is not set +-# CONFIG_NETPOLL is not set +-# CONFIG_NET_POLL_CONTROLLER is not set +-# CONFIG_HAMRADIO is not set +-# CONFIG_IRDA is not set +-# CONFIG_BT is not set + CONFIG_NETDEVICES=y + # CONFIG_DUMMY is not set + # CONFIG_BONDING is not set +@@ -347,6 +388,11 @@ + # CONFIG_ARCNET is not set + + # ++# PHY device support ++# ++# CONFIG_PHYLIB is not set ++ ++# + # Ethernet (10 or 100Mbit) + # + CONFIG_NET_ETHERNET=y +@@ -354,8 +400,8 @@ + # CONFIG_LASI_82596 is not set + # CONFIG_HAPPYMEAL is not set + # CONFIG_SUNGEM is not set ++# CONFIG_CASSINI is not set + # CONFIG_NET_VENDOR_3COM is not set +-# CONFIG_LANCE is not set + # CONFIG_NET_VENDOR_SMC is not set + # CONFIG_NET_VENDOR_RACAL is not set + +@@ -369,6 +415,7 @@ + # CONFIG_DE4X5 is not set + # CONFIG_WINBOND_840 is not set + # CONFIG_DM9102 is not set ++# CONFIG_ULI526X is not set + # CONFIG_DEPCA is not set + # CONFIG_HP100 is not set + # CONFIG_NET_ISA is not set +@@ -384,12 +431,15 @@ + # CONFIG_NS83820 is not set + # CONFIG_HAMACHI is not set + # CONFIG_R8169 is not set ++# CONFIG_SIS190 is not set + # CONFIG_SK98LIN is not set + # CONFIG_TIGON3 is not set ++# CONFIG_BNX2 is not set + + # + # Ethernet (10000 Mbit) + # ++# CONFIG_CHELSIO_T1 is not set + # CONFIG_IXGB is not set + # CONFIG_S2IO is not set + +@@ -413,12 +463,12 @@ + # + # Wireless 802.11b ISA/PCI cards support + # +-# CONFIG_AIRO is not set + # CONFIG_HERMES is not set + + # + # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support + # ++# CONFIG_HOSTAP is not set + CONFIG_NET_WIRELESS=y + + # +@@ -435,6 +485,8 @@ + # CONFIG_PPP_BSDCOMP is not set + # CONFIG_SLIP is not set + # CONFIG_NET_FC is not set ++# CONFIG_NETPOLL is not set ++# CONFIG_NET_POLL_CONTROLLER is not set + + # + # ISDN subsystem +@@ -464,23 +516,12 @@ # CONFIG_INPUT_EVBUG is not set # @@ -1792,7 +2584,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -@@ -488,7 +505,7 @@ +@@ -488,7 +529,7 @@ # CONFIG_KEYBOARD_HIL_OLD is not set # CONFIG_KEYBOARD_HIL is not set CONFIG_INPUT_MOUSE=y @@ -1801,7 +2593,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_INPORT is not set # CONFIG_MOUSE_LOGIBM is not set -@@ -502,6 +519,20 @@ +@@ -502,6 +543,19 @@ # CONFIG_HP_SDC_RTC is not set # @@ -1816,13 +2608,25 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set -+CONFIG_SOUND_GAMEPORT=y + +# # Character devices # CONFIG_VT=y -@@ -529,6 +560,7 @@ +@@ -519,8 +573,11 @@ + CONFIG_SERIAL_8250_MANY_PORTS=y + CONFIG_SERIAL_8250_SHARE_IRQ=y + # CONFIG_SERIAL_8250_DETECT_IRQ is not set +-# CONFIG_SERIAL_8250_MULTIPORT is not set + # CONFIG_SERIAL_8250_RSA is not set ++# CONFIG_SERIAL_8250_FOURPORT is not set ++# CONFIG_SERIAL_8250_ACCENT is not set ++# CONFIG_SERIAL_8250_BOCA is not set ++# CONFIG_SERIAL_8250_HUB6 is not set + + # + # Non-8250 serial port support +@@ -529,6 +586,7 @@ # CONFIG_PDC_CONSOLE is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -1830,7 +2634,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -@@ -555,11 +587,14 @@ +@@ -555,11 +613,14 @@ # # Ftape, the floppy tape device driver # @@ -1846,7 +2650,28 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # I2C support # # CONFIG_I2C is not set -@@ -587,6 +622,11 @@ +@@ -570,10 +631,20 @@ + # CONFIG_W1 is not set + + # ++# Hardware Monitoring support ++# ++# CONFIG_HWMON is not set ++# CONFIG_HWMON_VID is not set ++ ++# + # Misc devices + # + + # ++# Multimedia Capabilities Port drivers ++# ++ ++# + # Multimedia devices + # + # CONFIG_VIDEO_DEV is not set +@@ -587,6 +658,11 @@ # Graphics support # CONFIG_FB=y @@ -1858,7 +2683,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_CIRRUS is not set -@@ -595,6 +635,7 @@ +@@ -595,6 +671,7 @@ # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_STI=y @@ -1866,9 +2691,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON_OLD is not set -@@ -607,17 +648,17 @@ +@@ -606,18 +683,19 @@ + # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set ++# CONFIG_FB_CYBLA is not set # CONFIG_FB_TRIDENT is not set +# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set @@ -1887,7 +2714,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -@@ -630,6 +671,7 @@ +@@ -630,6 +708,7 @@ CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y CONFIG_LOGO_PARISC_CLUT224=y @@ -1895,7 +2722,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Sound -@@ -639,13 +681,9 @@ +@@ -639,13 +718,9 @@ # # USB support # @@ -1910,7 +2737,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB Gadget Support -@@ -658,6 +696,11 @@ +@@ -658,23 +733,36 @@ # CONFIG_MMC is not set # @@ -1918,24 +2745,62 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# +# CONFIG_INFINIBAND is not set + ++# ++# SN Devices ++# ++ +# # File systems # CONFIG_EXT2_FS=y -@@ -668,6 +711,10 @@ + # CONFIG_EXT2_FS_XATTR is not set ++# CONFIG_EXT2_FS_XIP is not set + CONFIG_EXT3_FS=y + # CONFIG_EXT3_FS_XATTR is not set + CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -+ -+# -+# XFS support -+# ++# CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -@@ -727,7 +774,8 @@ ++CONFIG_INOTIFY=y + # CONFIG_QUOTA is not set + CONFIG_DNOTIFY=y + # CONFIG_AUTOFS_FS is not set + CONFIG_AUTOFS4_FS=y ++# CONFIG_FUSE_FS is not set + + # + # CD-ROM/DVD Filesystems +@@ -697,11 +785,10 @@ + CONFIG_PROC_FS=y + CONFIG_PROC_KCORE=y + CONFIG_SYSFS=y +-# CONFIG_DEVPTS_FS_XATTR is not set + CONFIG_TMPFS=y +-# CONFIG_TMPFS_XATTR is not set + # CONFIG_HUGETLB_PAGE is not set + CONFIG_RAMFS=y ++# CONFIG_RELAYFS_FS is not set + + # + # Miscellaneous filesystems +@@ -719,15 +806,19 @@ + # + CONFIG_NFS_FS=y + CONFIG_NFS_V3=y ++# CONFIG_NFS_V3_ACL is not set + CONFIG_NFSD=y + CONFIG_NFSD_V3=y ++# CONFIG_NFSD_V3_ACL is not set + CONFIG_NFSD_TCP=y + CONFIG_ROOT_NFS=y + CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y ++CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y -# CONFIG_SMB_FS is not set +CONFIG_SMB_FS=y @@ -1943,7 +2808,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set -@@ -785,13 +833,18 @@ +@@ -785,13 +876,19 @@ # # Kernel hacking # @@ -1951,6 +2816,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y +CONFIG_LOG_BUF_SHIFT=16 ++CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1962,7 +2828,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Security options -@@ -815,6 +868,7 @@ +@@ -815,6 +912,7 @@ # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set @@ -1970,7 +2836,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set -@@ -832,6 +886,10 @@ +@@ -832,8 +930,13 @@ # CONFIG_CRYPTO_TEST is not set # @@ -1981,16 +2847,19 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Library routines # # CONFIG_CRC_CCITT is not set -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/configs/c3000_defconfig CVS2_6_14_RC2_PA6/arch/parisc/configs/c3000_defconfig ---- LINUS_2_6_14_RC2/arch/parisc/configs/c3000_defconfig 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/configs/c3000_defconfig 2005-09-24 19:47:41.000000000 -0600 ++# CONFIG_CRC16 is not set + CONFIG_CRC32=y + # CONFIG_LIBCRC32C is not set +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/configs/c3000_defconfig CVS2_6_14_PA0/arch/parisc/configs/c3000_defconfig +--- LINUS_2_6_14/arch/parisc/configs/c3000_defconfig 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/configs/c3000_defconfig 2005-10-21 21:16:47.000000000 -0600 @@ -1,12 +1,16 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-pa5 -# Wed Jan 5 13:26:49 2005 -+# Linux kernel version: 2.6.14-rc2-pa1 -+# Sat Sep 24 18:33:00 2005 ++# Linux kernel version: 2.6.14-rc5-pa1 ++# Fri Oct 21 23:06:31 2005 # CONFIG_PARISC=y CONFIG_MMU=y @@ -2102,7 +2971,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Executable file formats -@@ -108,6 +128,184 @@ +@@ -108,6 +128,186 @@ # CONFIG_BINFMT_MISC is not set # @@ -2201,6 +3070,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m ++# CONFIG_IP_NF_TARGET_NFQUEUE is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -2245,6 +3115,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m ++# CONFIG_IP6_NF_TARGET_NFQUEUE is not set +CONFIG_IP6_NF_MANGLE=m +# CONFIG_IP6_NF_TARGET_MARK is not set +# CONFIG_IP6_NF_TARGET_HL is not set @@ -2287,7 +3158,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Device Drivers # -@@ -120,6 +318,11 @@ +@@ -120,6 +320,11 @@ # CONFIG_DEBUG_DRIVER is not set # @@ -2299,7 +3170,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Memory Technology Devices (MTD) # # CONFIG_MTD is not set -@@ -141,14 +344,14 @@ +@@ -141,14 +346,14 @@ # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set CONFIG_BLK_DEV_UMEM=m @@ -2316,7 +3187,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_CDROM_PKTCDVD is not set # -@@ -158,6 +361,7 @@ +@@ -158,6 +363,7 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y @@ -2324,7 +3195,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ATA/ATAPI/MFM/RLL support -@@ -201,6 +405,7 @@ +@@ -201,6 +407,7 @@ # CONFIG_BLK_DEV_HPT366 is not set # CONFIG_BLK_DEV_SC1200 is not set # CONFIG_BLK_DEV_PIIX is not set @@ -2332,7 +3203,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_BLK_DEV_NS87415=y # CONFIG_BLK_DEV_PDC202XX_OLD is not set # CONFIG_BLK_DEV_PDC202XX_NEW is not set -@@ -218,6 +423,7 @@ +@@ -218,6 +425,7 @@ # # SCSI device support # @@ -2340,7 +3211,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_SCSI=y CONFIG_SCSI_PROC_FS=y -@@ -230,6 +436,7 @@ +@@ -230,6 +438,7 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=y @@ -2348,7 +3219,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs -@@ -242,7 +449,9 @@ +@@ -242,7 +451,9 @@ # SCSI Transport Attributes # CONFIG_SCSI_SPI_ATTRS=y @@ -2359,7 +3230,12 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # SCSI low-level drivers -@@ -262,21 +471,20 @@ +@@ -258,25 +469,26 @@ + # CONFIG_SCSI_ADVANSYS is not set + # CONFIG_MEGARAID_NEWGEN is not set + # CONFIG_MEGARAID_LEGACY is not set ++# CONFIG_MEGARAID_SAS is not set + CONFIG_SCSI_SATA=y # CONFIG_SCSI_SATA_AHCI is not set # CONFIG_SCSI_SATA_SVW is not set CONFIG_SCSI_ATA_PIIX=m @@ -2374,6 +3250,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_SCSI_SATA_VIA=m # CONFIG_SCSI_SATA_VITESSE is not set -# CONFIG_SCSI_BUSLOGIC is not set ++CONFIG_SCSI_SATA_INTEL_COMBINED=y # CONFIG_SCSI_CPQFCTS is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set @@ -2383,7 +3260,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -@@ -286,20 +494,17 @@ +@@ -286,20 +498,17 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_IPR is not set @@ -2411,7 +3288,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set -@@ -316,19 +521,23 @@ +@@ -316,19 +525,24 @@ # CONFIG_MD_RAID10 is not set # CONFIG_MD_RAID5 is not set # CONFIG_MD_RAID6 is not set @@ -2439,11 +3316,12 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +# CONFIG_FUSION_FC is not set ++# CONFIG_FUSION_SAS is not set +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m # -@@ -342,151 +551,13 @@ +@@ -342,151 +556,13 @@ # CONFIG_I2O is not set # @@ -2596,7 +3474,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ARCnet devices -@@ -494,11 +565,16 @@ +@@ -494,12 +570,18 @@ # CONFIG_ARCNET is not set # @@ -2612,9 +3490,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd -CONFIG_HAPPYMEAL=m +# CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set ++# CONFIG_CASSINI is not set # CONFIG_NET_VENDOR_3COM is not set -@@ -514,28 +590,22 @@ + # +@@ -514,28 +596,22 @@ # CONFIG_DE4X5 is not set # CONFIG_WINBOND_840 is not set # CONFIG_DM9102 is not set @@ -2650,7 +3530,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SIS900 is not set # CONFIG_EPIC100 is not set # CONFIG_SUNDANCE is not set -@@ -554,15 +624,18 @@ +@@ -554,15 +630,18 @@ # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set @@ -2671,7 +3551,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_S2IO is not set # -@@ -593,6 +666,8 @@ +@@ -593,6 +672,8 @@ # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set @@ -2680,7 +3560,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ISDN subsystem -@@ -622,16 +697,6 @@ +@@ -622,16 +703,6 @@ # CONFIG_INPUT_EVBUG is not set # @@ -2697,7 +3577,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -@@ -649,6 +714,16 @@ +@@ -649,6 +720,16 @@ # CONFIG_INPUT_MISC is not set # @@ -2714,7 +3594,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Character devices # CONFIG_VT=y -@@ -666,7 +741,6 @@ +@@ -666,7 +747,6 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set @@ -2722,7 +3602,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SERIAL_8250_RSA is not set # -@@ -676,6 +750,7 @@ +@@ -676,6 +756,7 @@ # CONFIG_PDC_CONSOLE is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2730,7 +3610,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -@@ -698,12 +773,16 @@ +@@ -698,12 +779,16 @@ # # Ftape, the floppy tape device driver # @@ -2748,7 +3628,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # I2C support # # CONFIG_I2C is not set -@@ -714,10 +793,20 @@ +@@ -714,10 +799,20 @@ # CONFIG_W1 is not set # @@ -2769,7 +3649,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Multimedia devices # # CONFIG_VIDEO_DEV is not set -@@ -731,6 +820,11 @@ +@@ -731,6 +826,11 @@ # Graphics support # CONFIG_FB=y @@ -2781,7 +3661,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_CIRRUS is not set -@@ -739,6 +833,7 @@ +@@ -739,6 +839,7 @@ # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_STI=y @@ -2789,7 +3669,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON_OLD is not set -@@ -751,18 +846,20 @@ +@@ -751,18 +852,20 @@ # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set @@ -2812,7 +3692,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -@@ -775,6 +872,7 @@ +@@ -775,6 +878,7 @@ # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_LOGO_PARISC_CLUT224=y @@ -2820,7 +3700,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Sound -@@ -784,7 +882,78 @@ +@@ -784,7 +888,78 @@ # # Advanced Linux Sound Architecture # @@ -2852,8 +3732,6 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# PCI devices +# +# CONFIG_SND_ALI5451 is not set -+CONFIG_SND_AD1889=y -+# CONFIG_SND_AD1889_OPL3 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set @@ -2876,6 +3754,8 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_YMFPCI is not set ++CONFIG_SND_AD1889=y ++# CONFIG_SND_AD1889_OPL3 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set @@ -2900,7 +3780,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Open Sound System -@@ -794,6 +963,8 @@ +@@ -794,6 +969,8 @@ # # USB support # @@ -2909,7 +3789,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_USB=y CONFIG_USB_DEBUG=y -@@ -804,23 +975,23 @@ +@@ -804,23 +981,23 @@ # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG is not set @@ -2937,7 +3817,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_USB_ACM is not set CONFIG_USB_PRINTER=m -@@ -829,12 +1000,11 @@ +@@ -829,12 +1006,11 @@ # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set @@ -2953,7 +3833,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y -@@ -846,21 +1016,25 @@ +@@ -846,21 +1022,25 @@ CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y @@ -2983,7 +3863,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB Multimedia devices -@@ -879,6 +1053,7 @@ +@@ -879,6 +1059,7 @@ # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set @@ -2991,7 +3871,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB port drivers -@@ -894,7 +1069,6 @@ +@@ -894,7 +1075,6 @@ # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set @@ -2999,7 +3879,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set CONFIG_USB_LEGOTOWER=m -@@ -903,10 +1077,12 @@ +@@ -903,10 +1083,12 @@ # CONFIG_USB_CYTHERM is not set # CONFIG_USB_PHIDGETKIT is not set # CONFIG_USB_PHIDGETSERVO is not set @@ -3013,7 +3893,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # -@@ -920,27 +1096,41 @@ +@@ -920,27 +1102,41 @@ # CONFIG_MMC is not set # @@ -3056,7 +3936,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # CD-ROM/DVD Filesystems -@@ -966,13 +1156,11 @@ +@@ -966,13 +1162,11 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y @@ -3071,7 +3951,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Miscellaneous filesystems -@@ -996,16 +1184,19 @@ +@@ -996,16 +1190,19 @@ # CONFIG_NFS_FS=y CONFIG_NFS_V3=y @@ -3091,7 +3971,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -@@ -1014,6 +1205,7 @@ +@@ -1014,6 +1211,7 @@ # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -3099,7 +3979,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Partition Types -@@ -1074,13 +1266,19 @@ +@@ -1074,13 +1272,19 @@ # # Kernel hacking # @@ -3119,7 +3999,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Security options -@@ -1092,21 +1290,22 @@ +@@ -1092,21 +1296,22 @@ # Cryptographic options # CONFIG_CRYPTO=y @@ -3151,7 +4031,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_KHAZAD is not set -@@ -1117,9 +1316,14 @@ +@@ -1117,9 +1322,14 @@ CONFIG_CRYPTO_TEST=m # @@ -3166,24 +4046,22 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/defconfig CVS2_6_14_RC2_PA6/arch/parisc/defconfig ---- LINUS_2_6_14_RC2/arch/parisc/defconfig 2005-09-22 19:17:04.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/defconfig 2005-09-13 12:38:25.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/defconfig CVS2_6_14_PA0/arch/parisc/defconfig +--- LINUS_2_6_14/arch/parisc/defconfig 2005-10-27 21:30:33.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/defconfig 2005-10-21 21:16:47.000000000 -0600 @@ -1,38 +1,56 @@ # # Automatically generated make config: don't edit -+# Linux kernel version: 2.6.13-pa4 -+# Tue Sep 13 12:07:51 2005 ++# Linux kernel version: 2.6.14-rc5-pa1 ++# Fri Oct 21 23:01:33 2005 # CONFIG_PARISC=y CONFIG_MMU=y CONFIG_STACK_GROWSUP=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y -+# CONFIG_GENERIC_ISA_DMA is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y -+# CONFIG_ISA_DMA_API is not set # # Code maturity level options @@ -3198,6 +4076,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # General setup # +CONFIG_LOCALVERSION="" ++# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set @@ -3209,6 +4088,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y ++CONFIG_INITRAMFS_SOURCE="" # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set @@ -3232,7 +4112,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Loadable module support -@@ -45,10 +63,16 @@ +@@ -45,10 +63,21 @@ CONFIG_PA7000=y # CONFIG_PA7100LC is not set # CONFIG_PA7200 is not set @@ -3241,19 +4121,25 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_PA11=y -# CONFIG_64BIT is not set # CONFIG_SMP is not set ++# CONFIG_HZ_100 is not set ++CONFIG_HZ_250=y ++# CONFIG_HZ_1000 is not set ++CONFIG_HZ=250 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y ++# CONFIG_SPARSEMEM_STATIC is not set # CONFIG_PREEMPT is not set # CONFIG_HPUX is not set -@@ -66,13 +90,29 @@ +@@ -65,14 +94,29 @@ + # CONFIG_ISA is not set CONFIG_PCI=y CONFIG_PCI_LEGACY_PROC=y - CONFIG_PCI_NAMES=y +-CONFIG_PCI_NAMES=y +# CONFIG_PCI_DEBUG is not set CONFIG_GSC_DINO=y CONFIG_PCI_LBA=y @@ -3280,7 +4166,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Executable file formats -@@ -81,12 +121,84 @@ +@@ -81,15 +125,97 @@ # CONFIG_BINFMT_MISC is not set # @@ -3312,8 +4198,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set -+CONFIG_IP_TCPDIAG=y -+CONFIG_IP_TCPDIAG_IPV6=y ++# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +CONFIG_IPV6=y @@ -3326,6 +4211,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_NETFILTER is not set + +# ++# DCCP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_DCCP is not set ++ ++# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set @@ -3351,6 +4241,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set ++# CONFIG_IEEE80211 is not set + +# # Device Drivers @@ -3365,7 +4256,15 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_DEBUG_DRIVER is not set # -@@ -99,12 +211,10 @@ ++# Connector - unified userspace <-> kernelspace linker ++# ++# CONFIG_CONNECTOR is not set ++ ++# + # Memory Technology Devices (MTD) + # + # CONFIG_MTD is not set +@@ -99,12 +225,10 @@ # CONFIG_PARPORT=y CONFIG_PARPORT_PC=y @@ -3378,7 +4277,13 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_PARPORT_1284 is not set # -@@ -120,12 +230,27 @@ +@@ -114,18 +238,31 @@ + # + # Block devices + # +-# CONFIG_BLK_DEV_FD is not set + # CONFIG_PARIDE is not set + # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set @@ -3392,7 +4297,6 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CDROM_PKTCDVD is not set + +# @@ -3406,7 +4310,15 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ATA/ATAPI/MFM/RLL support -@@ -147,53 +272,57 @@ +@@ -135,6 +272,7 @@ + # + # SCSI device support + # ++# CONFIG_RAID_ATTRS is not set + CONFIG_SCSI=y + CONFIG_SCSI_PROC_FS=y + +@@ -147,53 +285,59 @@ CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=y @@ -3426,6 +4338,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_SCSI_SPI_ATTRS=y +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set ++# CONFIG_SCSI_SAS_ATTRS is not set + +# # SCSI low-level drivers @@ -3443,6 +4356,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set ++# CONFIG_MEGARAID_SAS is not set # CONFIG_SCSI_SATA is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_CPQFCTS is not set @@ -3474,7 +4388,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_QLA2XXX=y -@@ -202,7 +331,8 @@ +@@ -202,7 +346,8 @@ # CONFIG_SCSI_QLA2300 is not set # CONFIG_SCSI_QLA2322 is not set # CONFIG_SCSI_QLA6312 is not set @@ -3484,7 +4398,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SCSI_SIM710 is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set -@@ -217,15 +347,19 @@ +@@ -217,15 +362,20 @@ CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y @@ -3501,10 +4415,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set ++# CONFIG_FUSION_SAS is not set # # IEEE 1394 (FireWire) support -@@ -238,80 +372,18 @@ +@@ -238,80 +388,23 @@ # CONFIG_I2O is not set # @@ -3513,8 +4428,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd - -# -# Networking support -+# Network device support - # +-# -CONFIG_NET=y - -# @@ -3570,7 +4484,8 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd - -# -# Network testing --# ++# Network device support + # -# CONFIG_NET_PKTGEN is not set CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set @@ -3587,10 +4502,36 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_ETHERTAP is not set ++ ++# ++# PHY device support ++# ++# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) -@@ -365,26 +437,30 @@ +@@ -321,6 +414,7 @@ + CONFIG_LASI_82596=y + # CONFIG_HAPPYMEAL is not set + # CONFIG_SUNGEM is not set ++# CONFIG_CASSINI is not set + # CONFIG_NET_VENDOR_3COM is not set + # CONFIG_NET_VENDOR_SMC is not set + +@@ -336,6 +430,7 @@ + # CONFIG_DE4X5 is not set + # CONFIG_WINBOND_840 is not set + # CONFIG_DM9102 is not set ++# CONFIG_ULI526X is not set + # CONFIG_DEPCA is not set + # CONFIG_HP100 is not set + CONFIG_NET_PCI=y +@@ -361,30 +456,37 @@ + # CONFIG_SUNDANCE is not set + # CONFIG_TLAN is not set + # CONFIG_VIA_RHINE is not set ++# CONFIG_NET_POCKET is not set + # # Ethernet (1000 Mbit) # @@ -3604,7 +4545,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set --# CONFIG_SIS190 is not set + # CONFIG_SIS190 is not set +# CONFIG_SKGE is not set # CONFIG_SK98LIN is not set -# CONFIG_TIGON3 is not set @@ -3615,6 +4556,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Ethernet (10000 Mbit) # ++# CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set @@ -3630,7 +4572,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Wireless LAN (non-hamradio) -@@ -399,38 +475,29 @@ +@@ -399,38 +501,30 @@ # # Wireless 802.11b ISA/PCI cards support # @@ -3648,6 +4590,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd -# CONFIG_RCPCI is not set -# CONFIG_SHAPER is not set +# CONFIG_PRISM54 is not set ++# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y # @@ -3682,7 +4625,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # ISDN subsystem -@@ -460,51 +527,67 @@ +@@ -460,51 +554,67 @@ # CONFIG_INPUT_EVBUG is not set # @@ -3766,7 +4709,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Character devices # CONFIG_VT=y -@@ -522,16 +605,16 @@ +@@ -522,16 +632,16 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set @@ -3786,7 +4729,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -@@ -541,12 +624,6 @@ +@@ -541,12 +651,6 @@ # CONFIG_TIPAR is not set # @@ -3799,7 +4742,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # IPMI # # CONFIG_IPMI_HANDLER is not set -@@ -555,7 +632,6 @@ +@@ -555,7 +659,6 @@ # Watchdog Cards # # CONFIG_WATCHDOG is not set @@ -3807,7 +4750,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set -@@ -565,15 +641,30 @@ +@@ -565,21 +668,40 @@ # # Ftape, the floppy tape device driver # @@ -3825,9 +4768,8 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # I2C support # # CONFIG_I2C is not set -+# CONFIG_I2C_SENSOR is not set -+ -+# + + # +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set @@ -3836,11 +4778,22 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# Hardware Monitoring support +# +CONFIG_HWMON=y ++# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set ++ ++# + # Misc devices + # # - # Misc devices -@@ -593,34 +684,44 @@ ++# Multimedia Capabilities Port drivers ++# ++ ++# + # Multimedia devices + # + # CONFIG_VIDEO_DEV is not set +@@ -593,34 +715,45 @@ # Graphics support # CONFIG_FB=y @@ -3870,6 +4823,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set ++# CONFIG_FB_CYBLA is not set # CONFIG_FB_TRIDENT is not set +# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set @@ -3889,7 +4843,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -@@ -629,6 +730,7 @@ +@@ -629,6 +762,7 @@ # Logo configuration # # CONFIG_LOGO is not set @@ -3897,7 +4851,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # Sound -@@ -638,17 +740,93 @@ +@@ -638,17 +772,94 @@ # # Advanced Linux Sound Architecture # @@ -3922,14 +4876,13 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set ++CONFIG_SND_AC97_CODEC=y ++CONFIG_SND_AC97_BUS=y + +# +# PCI devices +# -+CONFIG_SND_AC97_CODEC=y +# CONFIG_SND_ALI5451 is not set -+CONFIG_SND_AD1889=y -+# CONFIG_SND_AD1889_OPL3 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set @@ -3952,6 +4905,8 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_YMFPCI is not set ++CONFIG_SND_AD1889=y ++# CONFIG_SND_AD1889_OPL3 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set @@ -3993,7 +4948,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd CONFIG_USB=y CONFIG_USB_DEBUG=y -@@ -658,13 +836,20 @@ +@@ -658,26 +869,36 @@ # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set @@ -4014,8 +4969,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB Device Class drivers -@@ -674,10 +859,14 @@ - # CONFIG_USB_MIDI is not set + # +-# CONFIG_USB_AUDIO is not set ++# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set + # CONFIG_USB_BLUETOOTH_TTY is not set +-# CONFIG_USB_MIDI is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set + @@ -4030,7 +4988,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # CONFIG_USB_HID is not set -@@ -688,16 +877,21 @@ +@@ -688,16 +909,23 @@ # CONFIG_USB_MOUSE is not set # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set @@ -4040,9 +4998,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_ITMTOUCH is not set +# CONFIG_USB_EGALAX is not set ++# CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set ++# CONFIG_USB_APPLETOUCH is not set # # USB Imaging devices @@ -4053,7 +5013,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB Multimedia devices -@@ -709,13 +903,15 @@ +@@ -709,13 +937,15 @@ # # @@ -4070,7 +5030,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB port drivers -@@ -732,12 +928,21 @@ +@@ -732,12 +962,21 @@ # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set @@ -4093,7 +5053,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # # USB Gadget Support -@@ -745,20 +950,42 @@ +@@ -745,22 +984,41 @@ # CONFIG_USB_GADGET is not set # @@ -4123,10 +5083,6 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set -+ -+# -+# XFS support -+# # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -4135,8 +5091,11 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set ++# CONFIG_FUSE_FS is not set -@@ -773,7 +1000,8 @@ + # + # CD-ROM/DVD Filesystems +@@ -773,7 +1031,8 @@ # # DOS/FAT/NT Filesystems # @@ -4146,19 +5105,21 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_NTFS_FS is not set # -@@ -781,9 +1009,10 @@ +@@ -781,11 +1040,11 @@ # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y -# CONFIG_DEVFS_FS is not set +-# CONFIG_DEVPTS_FS_XATTR is not set +CONFIG_SYSFS=y - # CONFIG_DEVPTS_FS_XATTR is not set CONFIG_TMPFS=y -+# CONFIG_TMPFS_XATTR is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y ++# CONFIG_RELAYFS_FS is not set -@@ -809,18 +1038,22 @@ + # + # Miscellaneous filesystems +@@ -809,23 +1068,28 @@ # CONFIG_NFS_FS=y CONFIG_NFS_V3=y @@ -4182,7 +5143,13 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set -@@ -861,6 +1094,7 @@ + # CONFIG_CODA_FS is not set + # CONFIG_AFS_FS is not set ++# CONFIG_9P_FS is not set + + # + # Partition Types +@@ -861,6 +1125,7 @@ # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set @@ -4190,7 +5157,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_NLS_ISO8859_1 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set -@@ -885,17 +1119,23 @@ +@@ -885,17 +1150,24 @@ # # Kernel hacking # @@ -4199,6 +5166,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd -# CONFIG_DEBUG_SLAB is not set CONFIG_MAGIC_SYSRQ=y +CONFIG_LOG_BUF_SHIFT=15 ++CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -4217,7 +5185,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_SECURITY is not set # -@@ -909,6 +1149,8 @@ +@@ -909,6 +1181,8 @@ # CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set @@ -4226,7 +5194,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set -@@ -916,11 +1158,22 @@ +@@ -916,11 +1190,23 @@ # CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set @@ -4247,11 +5215,12 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd # Library routines # +# CONFIG_CRC_CCITT is not set ++# CONFIG_CRC16 is not set CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/cache.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/cache.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/cache.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/cache.c 2005-07-21 21:32:43.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/cache.c CVS2_6_14_PA0/arch/parisc/kernel/cache.c +--- LINUS_2_6_14/arch/parisc/kernel/cache.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/cache.c 2005-07-21 21:32:43.000000000 -0600 @@ -27,6 +27,7 @@ #include #include @@ -4290,9 +5259,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd rangetime = mfctl(16) - rangetime; printk(KERN_DEBUG "Whole cache flush %lu cycles, flushing %lu bytes %lu cycles\n", -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/drivers.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/drivers.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/drivers.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/drivers.c 2005-09-11 20:36:49.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/drivers.c CVS2_6_14_PA0/arch/parisc/kernel/drivers.c +--- LINUS_2_6_14/arch/parisc/kernel/drivers.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/drivers.c 2005-09-11 20:36:49.000000000 -0600 @@ -46,36 +46,51 @@ .bus_id = "parisc", }; @@ -4714,9 +5683,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd - } + for_each_padev(print_one_device, NULL); } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/entry.S CVS2_6_14_RC2_PA6/arch/parisc/kernel/entry.S ---- LINUS_2_6_14_RC2/arch/parisc/kernel/entry.S 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/entry.S 2005-09-14 06:54:53.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/entry.S CVS2_6_14_PA0/arch/parisc/kernel/entry.S +--- LINUS_2_6_14/arch/parisc/kernel/entry.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/entry.S 2005-10-19 13:36:52.000000000 -0600 @@ -30,14 +30,14 @@ * - save registers to kernel stack and handle in assembly or C */ @@ -5024,7 +5993,17 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd shld %r1, 6, %r20 #else shlw %r1, 5, %r20 -@@ -985,24 +992,19 @@ +@@ -963,9 +970,6 @@ + add %r19,%r20,%r19 /* now have &irq_stat[smp_processor_id()] */ + #endif /* CONFIG_SMP */ + +- LDREG IRQSTAT_SIRQ_PEND(%r19),%r20 /* hardirq.h: unsigned long */ +- cmpib,<>,n 0,%r20,intr_do_softirq /* forward */ +- + intr_check_resched: + + /* check for reschedule */ +@@ -985,24 +989,19 @@ rest_fp %r1 rest_general %r29 @@ -5057,18 +6036,25 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd rest_stack rfi -@@ -1017,8 +1019,8 @@ +@@ -1015,17 +1014,6 @@ + nop + nop - .import do_softirq,code - intr_do_softirq: +- .import do_softirq,code +-intr_do_softirq: - bl do_softirq,%r2 -#ifdef __LP64__ -+ BL do_softirq,%r2 -+#ifdef CONFIG_64BIT - ldo -16(%r30),%r29 /* Reference param save area */ - #else - nop -@@ -1036,12 +1038,17 @@ +- ldo -16(%r30),%r29 /* Reference param save area */ +-#else +- nop +-#endif +- b intr_check_resched +- nop +- + .import schedule,code + intr_do_resched: + /* Only do reschedule if we are returning to user space */ +@@ -1036,12 +1024,17 @@ CMPIB= 0,%r20,intr_restore /* backward */ nop @@ -5087,7 +6073,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo R%intr_check_sig(%r2), %r2 -@@ -1064,7 +1071,7 @@ +@@ -1064,7 +1057,7 @@ copy %r0, %r24 /* unsigned long in_syscall */ copy %r16, %r25 /* struct pt_regs *regs */ @@ -5096,7 +6082,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #endif -@@ -1088,7 +1095,7 @@ +@@ -1088,7 +1081,7 @@ mfctl %cr31,%r1 copy %r30,%r17 /* FIXME! depi below has hardcoded idea of interrupt stack size (32k)*/ @@ -5105,7 +6091,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd depdi 0,63,15,%r17 #else depi 0,31,15,%r17 -@@ -1115,7 +1122,7 @@ +@@ -1115,7 +1108,7 @@ ldil L%intr_return, %r2 @@ -5114,7 +6100,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #endif -@@ -1153,15 +1160,17 @@ +@@ -1153,15 +1146,17 @@ CMPIB=,n 6,%r26,skip_save_ior @@ -5134,7 +6120,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd */ extrd,u,*<> %r8,PSW_W_BIT,1,%r0 depdi 0,1,2,%r17 -@@ -1192,7 +1201,7 @@ +@@ -1192,7 +1187,7 @@ loadgp copy %r29, %r25 /* arg1 is pt_regs */ @@ -5143,7 +6129,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #endif -@@ -1230,7 +1239,7 @@ +@@ -1230,7 +1225,7 @@ spc = r24 /* space for which the trap occured */ ptp = r25 /* page directory/page table pointer */ @@ -5152,7 +6138,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd dtlb_miss_20w: space_adjust spc,va,t0 -@@ -1487,10 +1496,10 @@ +@@ -1487,10 +1482,10 @@ add,l %r1,%r24,%r1 /* doesn't affect c/b bits */ nadtlb_nullify: @@ -5165,7 +6151,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd rfir nop -@@ -1521,7 +1530,7 @@ +@@ -1521,7 +1516,7 @@ nop @@ -5174,7 +6160,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd itlb_miss_20w: /* -@@ -1588,7 +1597,7 @@ +@@ -1588,7 +1583,7 @@ #endif @@ -5183,7 +6169,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd dbit_trap_20w: space_adjust spc,va,t0 -@@ -1797,7 +1806,7 @@ +@@ -1797,7 +1792,7 @@ STREG %r2,-RP_OFFSET(%r30) ldo FRAME_SIZE(%r30),%r30 @@ -5192,7 +6178,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #endif -@@ -1847,10 +1856,11 @@ +@@ -1847,10 +1842,11 @@ STREG %r2,-RP_OFFSET(%r30) ldo FRAME_SIZE(%r30),%r30 @@ -5205,7 +6191,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd STREG %r2,PT_GR19(%r1) /* save for child */ STREG %r30,PT_GR21(%r1) BL sys_clone,%r2 -@@ -1869,7 +1879,7 @@ +@@ -1869,7 +1865,7 @@ STREG %r2,-RP_OFFSET(%r30) ldo FRAME_SIZE(%r30),%r30 @@ -5214,7 +6200,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #endif -@@ -1897,10 +1907,10 @@ +@@ -1897,10 +1893,10 @@ STREG %r2,-RP_OFFSET(%r30) ldo FRAME_SIZE(%r30),%r30 @@ -5227,7 +6213,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd copy %r1,%arg0 ldo -FRAME_SIZE(%r30),%r30 -@@ -1923,7 +1933,7 @@ +@@ -1923,7 +1919,7 @@ sys_execve_wrapper: execve_wrapper sys_execve @@ -5236,7 +6222,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .export sys32_execve_wrapper .import sys32_execve -@@ -1937,7 +1947,7 @@ +@@ -1937,7 +1933,7 @@ ldo TASK_REGS(%r26),%r26 /* get pt regs */ /* Don't save regs, we are going to restore them from sigcontext. */ STREG %r2, -RP_OFFSET(%r30) @@ -5245,7 +6231,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo FRAME_SIZE(%r30), %r30 BL sys_rt_sigreturn,%r2 ldo -16(%r30),%r29 /* Reference param save area */ -@@ -1968,7 +1978,7 @@ +@@ -1968,7 +1964,7 @@ ldo TASK_REGS(%r1),%r24 /* get pt regs */ LDREG TASK_PT_GR30(%r24),%r24 STREG %r2, -RP_OFFSET(%r30) @@ -5254,7 +6240,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo FRAME_SIZE(%r30), %r30 b,l do_sigaltstack,%r2 ldo -16(%r30),%r29 /* Reference param save area */ -@@ -1982,7 +1992,7 @@ +@@ -1982,7 +1978,7 @@ bv %r0(%r2) nop @@ -5263,7 +6249,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .export sys32_sigaltstack_wrapper sys32_sigaltstack_wrapper: /* Get the user stack pointer */ -@@ -2006,7 +2016,7 @@ +@@ -2006,7 +2002,7 @@ reg_save %r24 STREG %r2, -RP_OFFSET(%r30) @@ -5272,7 +6258,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo FRAME_SIZE(%r30), %r30 b,l sys_rt_sigsuspend,%r2 ldo -16(%r30),%r29 /* Reference param save area */ -@@ -2079,7 +2089,7 @@ +@@ -2079,7 +2075,7 @@ ldw TI_CPU-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r26 /* cpu # */ /* shift left ____cacheline_aligned (aka L1_CACHE_BYTES) bits */ @@ -5281,7 +6267,17 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd shld %r26, 6, %r20 #else shlw %r26, 5, %r20 -@@ -2144,7 +2154,7 @@ +@@ -2087,9 +2083,6 @@ + add %r19,%r20,%r19 /* now have &irq_stat[smp_processor_id()] */ + #endif /* CONFIG_SMP */ + +- LDREG IRQSTAT_SIRQ_PEND(%r19),%r20 /* hardirq.h: unsigned long */ +- cmpib,<>,n 0,%r20,syscall_do_softirq /* forward */ +- + syscall_check_resched: + + /* check for reschedule */ +@@ -2144,7 +2137,7 @@ depi 3,31,2,%r31 /* ensure return to user mode. */ @@ -5290,16 +6286,20 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* decide whether to reset the wide mode bit * * For a syscall, the W bit is stored in the lowest bit -@@ -2229,7 +2239,7 @@ - - .import do_softirq,code - syscall_do_softirq: -- bl do_softirq,%r2 -+ BL do_softirq,%r2 +@@ -2227,20 +2220,10 @@ + b intr_restore nop - /* NOTE: We enable I-bit incase we schedule later, - * and we might be going back to userspace if we were -@@ -2240,7 +2250,7 @@ + +- .import do_softirq,code +-syscall_do_softirq: +- bl do_softirq,%r2 +- nop +- /* NOTE: We enable I-bit incase we schedule later, +- * and we might be going back to userspace if we were +- * traced. */ +- b syscall_check_resched +- ssm PSW_SM_I, %r0 /* do_softirq returns with I bit off */ +- .import schedule,code syscall_do_resched: BL schedule,%r2 @@ -5308,7 +6308,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #else nop -@@ -2260,7 +2270,7 @@ +@@ -2260,7 +2243,7 @@ ldi 1, %r24 /* unsigned long in_syscall */ @@ -5317,9 +6317,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ldo -16(%r30),%r29 /* Reference param save area */ #endif BL do_signal,%r2 -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/firmware.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/firmware.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/firmware.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/firmware.c 2005-08-17 09:52:35.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/firmware.c CVS2_6_14_PA0/arch/parisc/kernel/firmware.c +--- LINUS_2_6_14/arch/parisc/kernel/firmware.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/firmware.c 2005-08-17 09:52:35.000000000 -0600 @@ -83,15 +83,15 @@ int parisc_narrow_firmware = 1; #endif @@ -5345,9 +6345,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd */ #ifdef __LP64__ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/head.S CVS2_6_14_RC2_PA6/arch/parisc/kernel/head.S ---- LINUS_2_6_14_RC2/arch/parisc/kernel/head.S 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/head.S 2005-09-14 06:54:53.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/head.S CVS2_6_14_PA0/arch/parisc/kernel/head.S +--- LINUS_2_6_14/arch/parisc/kernel/head.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/head.S 2005-09-14 06:54:53.000000000 -0600 @@ -12,7 +12,7 @@ * Initial Version 04-23-1999 by Helge Deller */ @@ -5529,9 +6529,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .word 0 -#endif /*!LP64*/ +#endif /*!CONFIG_64BIT*/ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/ioctl32.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/ioctl32.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/ioctl32.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/ioctl32.c 2005-04-12 13:17:10.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/ioctl32.c CVS2_6_14_PA0/arch/parisc/kernel/ioctl32.c +--- LINUS_2_6_14/arch/parisc/kernel/ioctl32.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/ioctl32.c 2005-04-12 13:17:10.000000000 -0600 @@ -104,12 +104,9 @@ } @@ -5606,10 +6606,20 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return ret; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/irq.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/irq.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/irq.c 2005-02-13 20:22:34.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/irq.c 2005-10-18 12:05:46.000000000 -0600 -@@ -43,26 +43,34 @@ +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/irq.c CVS2_6_14_PA0/arch/parisc/kernel/irq.c +--- LINUS_2_6_14/arch/parisc/kernel/irq.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/irq.c 2005-10-21 20:37:07.000000000 -0600 +@@ -30,6 +30,9 @@ + #include + #include + #include ++#include ++ ++#include + + #undef PARISC_IRQ_CR16_COUNTS + +@@ -43,26 +46,34 @@ */ static volatile unsigned long cpu_eiem = 0; @@ -5653,7 +6663,81 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } static unsigned int cpu_startup_irq(unsigned int irq) -@@ -250,10 +258,11 @@ +@@ -74,6 +85,35 @@ + void no_ack_irq(unsigned int irq) { } + void no_end_irq(unsigned int irq) { } + ++#ifdef CONFIG_SMP ++int cpu_check_affinity(unsigned int irq, cpumask_t *dest) ++{ ++ int cpu_dest; ++ ++ /* timer and ipi have to always be received on all CPUs */ ++ if (irq == TIMER_IRQ || irq == IPI_IRQ) { ++ /* Bad linux design decision. The mask has already ++ * been set; we must reset it */ ++ irq_affinity[irq] = CPU_MASK_ALL; ++ return -EINVAL; ++ } ++ ++ /* whatever mask they set, we just allow one CPU */ ++ cpu_dest = first_cpu(*dest); ++ *dest = cpumask_of_cpu(cpu_dest); ++ ++ return 0; ++} ++ ++static void cpu_set_affinity_irq(unsigned int irq, cpumask_t dest) ++{ ++ if (cpu_check_affinity(irq, &dest)) ++ return; ++ ++ irq_affinity[irq] = dest; ++} ++#endif ++ + static struct hw_interrupt_type cpu_interrupt_type = { + .typename = "CPU", + .startup = cpu_startup_irq, +@@ -82,7 +122,9 @@ + .disable = cpu_disable_irq, + .ack = no_ack_irq, + .end = no_end_irq, +-// .set_affinity = cpu_set_affinity_irq, ++#ifdef CONFIG_SMP ++ .set_affinity = cpu_set_affinity_irq, ++#endif + }; + + int show_interrupts(struct seq_file *p, void *v) +@@ -219,6 +261,17 @@ + return -1; + } + ++ ++unsigned long txn_affinity_addr(unsigned int irq, int cpu) ++{ ++#ifdef CONFIG_SMP ++ irq_affinity[irq] = cpumask_of_cpu(cpu); ++#endif ++ ++ return cpu_data[cpu].txn_addr; ++} ++ ++ + unsigned long txn_alloc_addr(unsigned int virt_irq) + { + static int next_cpu = -1; +@@ -233,7 +286,7 @@ + if (next_cpu >= NR_CPUS) + next_cpu = 0; /* nothing else, assign monarch */ + +- return cpu_data[next_cpu].txn_addr; ++ return txn_affinity_addr(virt_irq, next_cpu); + } + + +@@ -250,10 +303,11 @@ irq_enter(); /* @@ -5668,7 +6752,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* 1) only process IRQs that are enabled/unmasked (cpu_eiem) * 2) We loop here on EIRR contents in order to avoid -@@ -267,9 +276,6 @@ +@@ -267,23 +321,41 @@ if (!eirr_val) break; @@ -5678,7 +6762,33 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd mtctl(eirr_val, 23); /* reset bits we are going to process */ /* Work our way from MSb to LSb...same order we alloc EIRs */ -@@ -283,7 +289,8 @@ + for (irq = TIMER_IRQ; eirr_val && bit; bit>>=1, irq++) { ++#ifdef CONFIG_SMP ++ cpumask_t dest = irq_affinity[irq]; ++#endif + if (!(bit & eirr_val)) + continue; + + /* clear bit in mask - can exit loop sooner */ + eirr_val &= ~bit; + ++#ifdef CONFIG_SMP ++ /* FIXME: because generic set affinity mucks ++ * with the affinity before sending it to us ++ * we can get the situation where the affinity is ++ * wrong for our CPU type interrupts */ ++ if (irq != TIMER_IRQ && irq != IPI_IRQ && ++ !cpu_isset(smp_processor_id(), dest)) { ++ int cpu = first_cpu(dest); ++ ++ printk(KERN_DEBUG "redirecting irq %d from CPU %d to %d\n", ++ irq, smp_processor_id(), cpu); ++ gsc_writel(irq + CPU_IRQ_BASE, ++ cpu_data[cpu].hpa); ++ continue; ++ } ++#endif ++ __do_IRQ(irq, regs); } } @@ -5688,7 +6798,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd irq_exit(); } -@@ -291,12 +298,14 @@ +@@ -291,12 +363,14 @@ static struct irqaction timer_action = { .handler = timer_interrupt, .name = "timer", @@ -5703,9 +6813,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd }; #endif -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/pacache.S CVS2_6_14_RC2_PA6/arch/parisc/kernel/pacache.S ---- LINUS_2_6_14_RC2/arch/parisc/kernel/pacache.S 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/pacache.S 2005-10-05 22:41:47.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/pacache.S CVS2_6_14_PA0/arch/parisc/kernel/pacache.S +--- LINUS_2_6_14/arch/parisc/kernel/pacache.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/pacache.S 2005-10-05 22:41:47.000000000 -0600 @@ -26,7 +26,7 @@ * can be used. */ @@ -6149,9 +7259,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd rfi nop -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/pci-dma.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/pci-dma.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/pci-dma.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/pci-dma.c 2005-08-20 18:20:11.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/pci-dma.c CVS2_6_14_PA0/arch/parisc/kernel/pci-dma.c +--- LINUS_2_6_14/arch/parisc/kernel/pci-dma.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/pci-dma.c 2005-08-20 18:20:11.000000000 -0600 @@ -31,7 +31,7 @@ #include /* get_order */ #include @@ -6241,9 +7351,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd strcat(buf, "\n"); return strlen(buf); } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/pci.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/pci.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/pci.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/pci.c 2005-08-10 10:33:32.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/pci.c CVS2_6_14_PA0/arch/parisc/kernel/pci.c +--- LINUS_2_6_14/arch/parisc/kernel/pci.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/pci.c 2005-08-10 10:33:32.000000000 -0600 @@ -202,7 +202,8 @@ pcibios_link_hba_resources( struct resource *hba_res, struct resource *r) { @@ -6254,9 +7364,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd r->parent = hba_res; /* reverse link is harder *sigh* */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/pdc_cons.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/pdc_cons.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/pdc_cons.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/pdc_cons.c 2005-03-15 07:02:43.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/pdc_cons.c CVS2_6_14_PA0/arch/parisc/kernel/pdc_cons.c +--- LINUS_2_6_14/arch/parisc/kernel/pdc_cons.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/pdc_cons.c 2005-03-15 07:02:43.000000000 -0700 @@ -41,7 +41,7 @@ /* Define EARLY_BOOTUP_DEBUG to debug kernel related boot problems. @@ -6363,9 +7473,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd pdc_console_init_force(); } - -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/perf.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/perf.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/perf.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/perf.c 2005-09-11 19:23:52.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/perf.c CVS2_6_14_PA0/arch/parisc/kernel/perf.c +--- LINUS_2_6_14/arch/parisc/kernel/perf.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/perf.c 2005-09-11 19:23:52.000000000 -0600 @@ -746,7 +746,8 @@ uint64_t *bptr; uint32_t dwords; @@ -6397,9 +7507,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } return 0; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/process.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/process.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/process.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/process.c 2005-09-14 06:54:53.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/process.c CVS2_6_14_PA0/arch/parisc/kernel/process.c +--- LINUS_2_6_14/arch/parisc/kernel/process.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/process.c 2005-09-14 06:54:53.000000000 -0600 @@ -9,7 +9,7 @@ * Copyright (C) 2000-2003 Paul Bame * Copyright (C) 2000 Philipp Rumpf @@ -6463,9 +7573,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } return 0; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/processor.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/processor.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/processor.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/processor.c 2005-09-10 12:19:37.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/processor.c CVS2_6_14_PA0/arch/parisc/kernel/processor.c +--- LINUS_2_6_14/arch/parisc/kernel/processor.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/processor.c 2005-09-10 12:19:37.000000000 -0600 @@ -92,7 +92,7 @@ * May get overwritten by PAT code. */ @@ -6502,9 +7612,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd p->cpuid = cpuid; /* save CPU id */ p->txn_addr = txn_addr; /* save CPU IRQ address */ #ifdef CONFIG_SMP -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/real2.S CVS2_6_14_RC2_PA6/arch/parisc/kernel/real2.S ---- LINUS_2_6_14_RC2/arch/parisc/kernel/real2.S 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/real2.S 2005-05-12 23:25:09.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/real2.S CVS2_6_14_PA0/arch/parisc/kernel/real2.S +--- LINUS_2_6_14/arch/parisc/kernel/real2.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/real2.S 2005-05-12 23:25:09.000000000 -0600 @@ -7,8 +7,10 @@ * Copyright (C) 2000 Hewlett Packard (Paul Bame bame@puffin.external.hp.com) * @@ -6630,9 +7740,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd bve (%r2) #else bv %r0(%r2) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/signal.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/signal.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/signal.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/signal.c 2005-10-09 09:54:23.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/signal.c CVS2_6_14_PA0/arch/parisc/kernel/signal.c +--- LINUS_2_6_14/arch/parisc/kernel/signal.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/signal.c 2005-10-09 09:54:23.000000000 -0600 @@ -296,7 +296,6 @@ struct rt_sigframe __user *frame; unsigned long rp, usp; @@ -6677,9 +7787,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd "sync\n" : : "r"(regs->gr[30])); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/smp.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/smp.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/smp.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/smp.c 2005-10-18 12:05:46.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/smp.c CVS2_6_14_PA0/arch/parisc/kernel/smp.c +--- LINUS_2_6_14/arch/parisc/kernel/smp.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/smp.c 2005-10-18 12:05:46.000000000 -0600 @@ -18,7 +18,7 @@ */ #undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */ @@ -6772,9 +7882,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd data.func = func; data.info = info; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/syscall.S CVS2_6_14_RC2_PA6/arch/parisc/kernel/syscall.S ---- LINUS_2_6_14_RC2/arch/parisc/kernel/syscall.S 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/syscall.S 2005-09-14 14:58:36.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/syscall.S CVS2_6_14_PA0/arch/parisc/kernel/syscall.S +--- LINUS_2_6_14/arch/parisc/kernel/syscall.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/syscall.S 2005-09-14 14:58:36.000000000 -0600 @@ -6,6 +6,7 @@ * thanks to Philipp Rumpf, Mike Shaver and various others * sorry about the wall, puffin.. @@ -6953,9 +8063,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .align 4096 .export sys_call_table64 .Lsys_call_table64: -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/syscall_table.S CVS2_6_14_RC2_PA6/arch/parisc/kernel/syscall_table.S ---- LINUS_2_6_14_RC2/arch/parisc/kernel/syscall_table.S 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/syscall_table.S 2005-09-22 14:03:13.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/syscall_table.S CVS2_6_14_PA0/arch/parisc/kernel/syscall_table.S +--- LINUS_2_6_14/arch/parisc/kernel/syscall_table.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/syscall_table.S 2005-09-22 14:03:13.000000000 -0600 @@ -35,7 +35,7 @@ #undef ENTRY_UHOH #undef ENTRY_COMP @@ -6986,9 +8096,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + ENTRY_SAME(ioprio_get) /* Nothing yet */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/time.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/time.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/time.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/time.c 2005-09-14 06:54:53.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/time.c CVS2_6_14_PA0/arch/parisc/kernel/time.c +--- LINUS_2_6_14/arch/parisc/kernel/time.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/time.c 2005-09-14 06:54:53.000000000 -0600 @@ -89,14 +89,6 @@ } } @@ -7029,9 +8139,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /*** converted from ia64 ***/ /* * Return the number of micro-seconds that elapsed since the last -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/traps.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/traps.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/traps.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/traps.c 2005-07-23 10:31:43.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/traps.c CVS2_6_14_PA0/arch/parisc/kernel/traps.c +--- LINUS_2_6_14/arch/parisc/kernel/traps.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/traps.c 2005-07-23 10:31:43.000000000 -0600 @@ -74,7 +74,10 @@ char *level; unsigned long cr30; @@ -7083,9 +8193,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd cr30 = mfctl(30); cr31 = mfctl(31); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/kernel/unaligned.c CVS2_6_14_RC2_PA6/arch/parisc/kernel/unaligned.c ---- LINUS_2_6_14_RC2/arch/parisc/kernel/unaligned.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/kernel/unaligned.c 2005-09-14 15:00:31.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/kernel/unaligned.c CVS2_6_14_PA0/arch/parisc/kernel/unaligned.c +--- LINUS_2_6_14/arch/parisc/kernel/unaligned.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/kernel/unaligned.c 2005-09-14 15:00:31.000000000 -0600 @@ -513,15 +513,18 @@ register int flop=0; /* true if this is a flop */ @@ -7119,9 +8229,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd if (!unaligned_enabled) goto force_sigbus; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/lib/fixup.S CVS2_6_14_RC2_PA6/arch/parisc/lib/fixup.S ---- LINUS_2_6_14_RC2/arch/parisc/lib/fixup.S 2005-09-14 06:54:54.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/lib/fixup.S 2005-09-25 19:23:05.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/lib/fixup.S CVS2_6_14_PA0/arch/parisc/lib/fixup.S +--- LINUS_2_6_14/arch/parisc/lib/fixup.S 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/lib/fixup.S 2005-09-25 19:23:05.000000000 -0600 @@ -35,7 +35,7 @@ extrd,u \t2,63,32,\t2 #endif @@ -7140,9 +8250,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .text .section .fixup, "ax" -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/arch/parisc/lib/memcpy.c CVS2_6_14_RC2_PA6/arch/parisc/lib/memcpy.c ---- LINUS_2_6_14_RC2/arch/parisc/lib/memcpy.c 2005-09-22 19:17:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/arch/parisc/lib/memcpy.c 2005-08-02 20:47:39.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/arch/parisc/lib/memcpy.c CVS2_6_14_PA0/arch/parisc/lib/memcpy.c +--- LINUS_2_6_14/arch/parisc/lib/memcpy.c 2005-10-27 21:30:34.000000000 -0600 ++++ CVS2_6_14_PA0/arch/parisc/lib/memcpy.c 2005-08-02 20:47:39.000000000 -0600 @@ -339,6 +339,7 @@ pds = (double *)pcs; pdd = (double *)pcd; @@ -7159,9 +8269,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd pws = (unsigned int *)pds; pwd = (unsigned int *)pdd; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/ide/Kconfig CVS2_6_14_RC2_PA6/drivers/ide/Kconfig ---- LINUS_2_6_14_RC2/drivers/ide/Kconfig 2005-09-22 19:17:29.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/ide/Kconfig 2005-08-28 20:41:00.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/ide/Kconfig CVS2_6_14_PA0/drivers/ide/Kconfig +--- LINUS_2_6_14/drivers/ide/Kconfig 2005-10-27 21:30:36.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/ide/Kconfig 2005-08-28 20:41:00.000000000 -0600 @@ -616,7 +616,7 @@ tristate "NS87415 chipset support" help @@ -7171,9 +8281,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd Please read the comments at the top of . -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/ide/ide-lib.c CVS2_6_14_RC2_PA6/drivers/ide/ide-lib.c ---- LINUS_2_6_14_RC2/drivers/ide/ide-lib.c 2005-09-22 19:17:29.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/ide/ide-lib.c 2005-10-16 17:22:26.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/ide/ide-lib.c CVS2_6_14_PA0/drivers/ide/ide-lib.c +--- LINUS_2_6_14/drivers/ide/ide-lib.c 2005-10-27 21:30:36.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/ide/ide-lib.c 2005-10-16 17:22:26.000000000 -0600 @@ -410,10 +410,10 @@ { u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */ @@ -7189,9 +8299,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd addr = HWIF(drive)->pci_dev->dma_mask; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/input/keyboard/hil_kbd.c CVS2_6_14_RC2_PA6/drivers/input/keyboard/hil_kbd.c ---- LINUS_2_6_14_RC2/drivers/input/keyboard/hil_kbd.c 2005-09-22 19:17:30.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/input/keyboard/hil_kbd.c 2005-03-25 22:00:08.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/input/keyboard/hil_kbd.c CVS2_6_14_PA0/drivers/input/keyboard/hil_kbd.c +--- LINUS_2_6_14/drivers/input/keyboard/hil_kbd.c 2005-10-27 21:30:37.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/input/keyboard/hil_kbd.c 2005-03-25 22:00:08.000000000 -0700 @@ -204,7 +204,7 @@ hil_packet packet; int idx; @@ -7269,9 +8379,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .connect = hil_kbd_connect, .disconnect = hil_kbd_disconnect, .interrupt = hil_kbd_interrupt -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/input/keyboard/hilkbd.c CVS2_6_14_RC2_PA6/drivers/input/keyboard/hilkbd.c ---- LINUS_2_6_14_RC2/drivers/input/keyboard/hilkbd.c 2005-09-22 19:17:30.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/input/keyboard/hilkbd.c 2005-09-14 07:17:49.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/input/keyboard/hilkbd.c CVS2_6_14_PA0/drivers/input/keyboard/hilkbd.c +--- LINUS_2_6_14/drivers/input/keyboard/hilkbd.c 2005-10-27 21:30:37.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/input/keyboard/hilkbd.c 2005-09-14 07:17:49.000000000 -0600 @@ -22,7 +22,7 @@ #include #include @@ -7304,9 +8414,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = hil_tbl, .probe = hil_init_chip, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/input/mouse/hil_ptr.c CVS2_6_14_RC2_PA6/drivers/input/mouse/hil_ptr.c ---- LINUS_2_6_14_RC2/drivers/input/mouse/hil_ptr.c 2005-09-22 19:17:30.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/input/mouse/hil_ptr.c 2005-03-25 22:00:10.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/input/mouse/hil_ptr.c CVS2_6_14_PA0/drivers/input/mouse/hil_ptr.c +--- LINUS_2_6_14/drivers/input/mouse/hil_ptr.c 2005-10-27 21:30:37.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/input/mouse/hil_ptr.c 2005-03-25 22:00:10.000000000 -0700 @@ -196,7 +196,7 @@ hil_packet packet; int idx; @@ -7390,9 +8500,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd }; static int __init hil_ptr_init(void) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/input/serio/gscps2.c CVS2_6_14_RC2_PA6/drivers/input/serio/gscps2.c ---- LINUS_2_6_14_RC2/drivers/input/serio/gscps2.c 2005-09-22 19:17:31.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/input/serio/gscps2.c 2005-09-14 07:17:52.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/input/serio/gscps2.c CVS2_6_14_PA0/drivers/input/serio/gscps2.c +--- LINUS_2_6_14/drivers/input/serio/gscps2.c 2005-10-27 21:30:38.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/input/serio/gscps2.c 2005-09-14 07:17:52.000000000 -0600 @@ -211,9 +211,6 @@ writeb(0xff, addr+GSC_RESET); gscps2_flush(ps2port); @@ -7459,9 +8569,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = gscps2_device_tbl, .probe = gscps2_probe, .remove = gscps2_remove, -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/input/serio/hil_mlc.c CVS2_6_14_RC2_PA6/drivers/input/serio/hil_mlc.c ---- LINUS_2_6_14_RC2/drivers/input/serio/hil_mlc.c 2005-09-22 19:17:31.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/input/serio/hil_mlc.c 2005-04-04 14:46:50.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/input/serio/hil_mlc.c CVS2_6_14_PA0/drivers/input/serio/hil_mlc.c +--- LINUS_2_6_14/drivers/input/serio/hil_mlc.c 2005-10-27 21:30:38.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/input/serio/hil_mlc.c 2005-04-04 14:46:50.000000000 -0600 @@ -801,7 +801,8 @@ struct hil_mlc_serio_map *map; struct hil_mlc *mlc; @@ -7501,9 +8611,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd mlc_serio->write = hil_mlc_serio_write; mlc_serio->open = hil_mlc_serio_open; mlc_serio->close = hil_mlc_serio_close; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/input/serio/hp_sdc.c CVS2_6_14_RC2_PA6/drivers/input/serio/hp_sdc.c ---- LINUS_2_6_14_RC2/drivers/input/serio/hp_sdc.c 2005-09-22 19:17:31.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/input/serio/hp_sdc.c 2005-09-14 07:17:52.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/input/serio/hp_sdc.c CVS2_6_14_PA0/drivers/input/serio/hp_sdc.c +--- LINUS_2_6_14/drivers/input/serio/hp_sdc.c 2005-10-27 21:30:38.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/input/serio/hp_sdc.c 2005-09-14 07:17:52.000000000 -0600 @@ -764,7 +764,7 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d); @@ -7526,9 +8636,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return hp_sdc_init(); } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/isdn/hisax/Kconfig CVS2_6_14_RC2_PA6/drivers/isdn/hisax/Kconfig ---- LINUS_2_6_14_RC2/drivers/isdn/hisax/Kconfig 2005-09-22 19:17:32.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/isdn/hisax/Kconfig 2005-08-28 20:41:03.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/isdn/hisax/Kconfig CVS2_6_14_PA0/drivers/isdn/hisax/Kconfig +--- LINUS_2_6_14/drivers/isdn/hisax/Kconfig 2005-10-27 21:30:38.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/isdn/hisax/Kconfig 2005-08-28 20:41:03.000000000 -0600 @@ -110,7 +110,7 @@ config HISAX_TELESPCI @@ -7582,9 +8692,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd help This enables HiSax support for the AMD7930 chips on some SPARCs. This code is not finished yet. -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/isdn/pcbit/Kconfig CVS2_6_14_RC2_PA6/drivers/isdn/pcbit/Kconfig ---- LINUS_2_6_14_RC2/drivers/isdn/pcbit/Kconfig 2005-09-22 19:17:33.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/isdn/pcbit/Kconfig 2005-03-07 08:07:30.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/isdn/pcbit/Kconfig CVS2_6_14_PA0/drivers/isdn/pcbit/Kconfig +--- LINUS_2_6_14/drivers/isdn/pcbit/Kconfig 2005-10-27 21:30:38.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/isdn/pcbit/Kconfig 2005-03-07 08:07:30.000000000 -0700 @@ -3,7 +3,7 @@ # config ISDN_DRV_PCBIT @@ -7594,9 +8704,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd help This enables support for the PCBIT ISDN-card. This card is manufactured in Portugal by Octal. For running this card, -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/net/lasi_82596.c CVS2_6_14_RC2_PA6/drivers/net/lasi_82596.c ---- LINUS_2_6_14_RC2/drivers/net/lasi_82596.c 2005-09-22 19:17:39.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/net/lasi_82596.c 2005-09-10 12:21:47.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/net/lasi_82596.c CVS2_6_14_PA0/drivers/net/lasi_82596.c +--- LINUS_2_6_14/drivers/net/lasi_82596.c 2005-10-27 21:30:39.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/net/lasi_82596.c 2005-09-10 12:21:47.000000000 -0600 @@ -415,6 +415,10 @@ static int ticks_limit = 100; static int max_cmd_backlog = TX_RING_SIZE-1; @@ -7679,9 +8789,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = lan_tbl, .probe = lan_init_chip, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/net/tulip/media.c CVS2_6_14_RC2_PA6/drivers/net/tulip/media.c ---- LINUS_2_6_14_RC2/drivers/net/tulip/media.c 2005-09-22 19:17:41.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/net/tulip/media.c 2005-09-14 06:56:25.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/net/tulip/media.c CVS2_6_14_PA0/drivers/net/tulip/media.c +--- LINUS_2_6_14/drivers/net/tulip/media.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/net/tulip/media.c 2005-09-14 06:56:25.000000000 -0600 @@ -44,8 +44,10 @@ /* MII transceiver control section. @@ -7753,9 +8863,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd tmp_info = get_u16(&misc_info[1]); if (tmp_info) tp->advertising[phy_num] = tmp_info | 1; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/net/tulip/tulip.h CVS2_6_14_RC2_PA6/drivers/net/tulip/tulip.h ---- LINUS_2_6_14_RC2/drivers/net/tulip/tulip.h 2005-09-22 19:17:41.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/net/tulip/tulip.h 2005-09-14 06:56:25.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/net/tulip/tulip.h CVS2_6_14_PA0/drivers/net/tulip/tulip.h +--- LINUS_2_6_14/drivers/net/tulip/tulip.h 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/net/tulip/tulip.h 2005-09-14 06:56:25.000000000 -0600 @@ -474,8 +474,11 @@ udelay(10); @@ -7770,9 +8880,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/net/tulip/tulip_core.c CVS2_6_14_RC2_PA6/drivers/net/tulip/tulip_core.c ---- LINUS_2_6_14_RC2/drivers/net/tulip/tulip_core.c 2005-09-22 19:17:41.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/net/tulip/tulip_core.c 2005-09-14 06:56:25.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/net/tulip/tulip_core.c CVS2_6_14_PA0/drivers/net/tulip/tulip_core.c +--- LINUS_2_6_14/drivers/net/tulip/tulip_core.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/net/tulip/tulip_core.c 2005-09-14 06:56:25.000000000 -0600 @@ -22,7 +22,7 @@ #else #define DRV_VERSION "1.1.13" @@ -7791,9 +8901,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY | HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer }, -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/asp.c CVS2_6_14_RC2_PA6/drivers/parisc/asp.c ---- LINUS_2_6_14_RC2/drivers/parisc/asp.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/asp.c 2005-09-10 12:19:32.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/asp.c CVS2_6_14_PA0/drivers/parisc/asp.c +--- LINUS_2_6_14/drivers/parisc/asp.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/asp.c 2005-09-10 12:19:32.000000000 -0600 @@ -77,12 +77,12 @@ struct gsc_irq gsc_irq; int ret; @@ -7818,9 +8928,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = asp_tbl, .probe = asp_init_chip, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/ccio-dma.c CVS2_6_14_RC2_PA6/drivers/parisc/ccio-dma.c ---- LINUS_2_6_14_RC2/drivers/parisc/ccio-dma.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/ccio-dma.c 2005-10-14 00:02:08.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/ccio-dma.c CVS2_6_14_PA0/drivers/parisc/ccio-dma.c +--- LINUS_2_6_14/drivers/parisc/ccio-dma.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/ccio-dma.c 2005-10-14 00:02:08.000000000 -0600 @@ -100,9 +100,9 @@ #define DBG_RUN_SG(x...) #endif @@ -8130,9 +9240,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ccio_ioc_init(ioc); ccio_init_resources(ioc); hppa_dma_ops = &ccio_ops; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/ccio-rm-dma.c CVS2_6_14_RC2_PA6/drivers/parisc/ccio-rm-dma.c ---- LINUS_2_6_14_RC2/drivers/parisc/ccio-rm-dma.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/ccio-rm-dma.c 2005-09-10 12:19:32.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/ccio-rm-dma.c CVS2_6_14_PA0/drivers/parisc/ccio-rm-dma.c +--- LINUS_2_6_14/drivers/parisc/ccio-rm-dma.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/ccio-rm-dma.c 2005-09-10 12:19:32.000000000 -0600 @@ -167,7 +167,7 @@ { printk(KERN_INFO "%s found %s at 0x%lx\n", MODULE_NAME, @@ -8142,9 +9252,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* ** FIXME - should check U2 registers to verify it's really running -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/dino.c CVS2_6_14_RC2_PA6/drivers/parisc/dino.c ---- LINUS_2_6_14_RC2/drivers/parisc/dino.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/dino.c 2005-09-10 21:55:28.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/dino.c CVS2_6_14_PA0/drivers/parisc/dino.c +--- LINUS_2_6_14/drivers/parisc/dino.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/dino.c 2005-09-10 21:55:28.000000000 -0600 @@ -178,6 +178,8 @@ void __iomem *base_addr = d->hba.base_addr; unsigned long flags; @@ -8276,9 +9386,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd }; /* -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/eisa.c CVS2_6_14_RC2_PA6/drivers/parisc/eisa.c ---- LINUS_2_6_14_RC2/drivers/parisc/eisa.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/eisa.c 2005-09-10 12:19:32.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/eisa.c CVS2_6_14_PA0/drivers/parisc/eisa.c +--- LINUS_2_6_14/drivers/parisc/eisa.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/eisa.c 2005-09-10 12:19:32.000000000 -0600 @@ -315,7 +315,7 @@ char *name = is_mongoose(dev) ? "Mongoose" : "Wax"; @@ -8297,9 +9407,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = eisa_tbl, .probe = eisa_probe, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/gsc.c CVS2_6_14_RC2_PA6/drivers/parisc/gsc.c ---- LINUS_2_6_14_RC2/drivers/parisc/gsc.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/gsc.c 2005-07-28 12:16:52.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/gsc.c CVS2_6_14_PA0/drivers/parisc/gsc.c +--- LINUS_2_6_14/drivers/parisc/gsc.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/gsc.c 2005-07-28 12:16:52.000000000 -0600 @@ -183,12 +183,20 @@ *irqp = irq; } @@ -8330,9 +9440,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/hppb.c CVS2_6_14_RC2_PA6/drivers/parisc/hppb.c ---- LINUS_2_6_14_RC2/drivers/parisc/hppb.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/hppb.c 2005-09-10 12:25:41.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/hppb.c CVS2_6_14_PA0/drivers/parisc/hppb.c +--- LINUS_2_6_14/drivers/parisc/hppb.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/hppb.c 2005-09-10 12:25:41.000000000 -0600 @@ -68,14 +68,14 @@ memset(card->next, '\0', sizeof(struct hppb_card)); card = card->next; @@ -8361,9 +9471,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = hppb_tbl, .probe = hppb_probe, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/iosapic.c CVS2_6_14_RC2_PA6/drivers/parisc/iosapic.c ---- LINUS_2_6_14_RC2/drivers/parisc/iosapic.c 2005-09-14 06:56:31.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/iosapic.c 2005-09-24 19:52:20.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/iosapic.c CVS2_6_14_PA0/drivers/parisc/iosapic.c +--- LINUS_2_6_14/drivers/parisc/iosapic.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/iosapic.c 2005-10-19 13:55:31.000000000 -0600 @@ -244,7 +244,7 @@ * 4-byte alignment on 32-bit kernels */ @@ -8373,9 +9483,49 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return (struct irt_entry *)a; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/lasi.c CVS2_6_14_RC2_PA6/drivers/parisc/lasi.c ---- LINUS_2_6_14_RC2/drivers/parisc/lasi.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/lasi.c 2005-09-14 06:56:31.000000000 -0600 +@@ -700,6 +700,28 @@ + return 0; + } + ++#ifdef CONFIG_SMP ++static void iosapic_set_affinity_irq(unsigned int irq, cpumask_t dest) ++{ ++ struct vector_info *vi = iosapic_get_vector(irq); ++ u32 d0, d1, dummy_d0; ++ unsigned long flags; ++ ++ if (cpu_check_affinity(irq, &dest)) ++ return; ++ ++ vi->txn_addr = txn_affinity_addr(irq, first_cpu(dest)); ++ ++ spin_lock_irqsave(&iosapic_lock, flags); ++ /* d1 contains the destination CPU, so only want to set that ++ * entry */ ++ iosapic_rd_irt_entry(vi, &d0, &d1); ++ iosapic_set_irt_data(vi, &dummy_d0, &d1); ++ iosapic_wr_irt_entry(vi, d0, d1); ++ spin_unlock_irqrestore(&iosapic_lock, flags); ++} ++#endif ++ + static struct hw_interrupt_type iosapic_interrupt_type = { + .typename = "IO-SAPIC-level", + .startup = iosapic_startup_irq, +@@ -708,7 +730,9 @@ + .disable = iosapic_disable_irq, + .ack = no_ack_irq, + .end = iosapic_end_irq, +-// .set_affinity = iosapic_set_affinity_irq, ++#ifdef CONFIG_SMP ++ .set_affinity = iosapic_set_affinity_irq, ++#endif + }; + + int iosapic_fixup_irq(void *isi_obj, struct pci_dev *pcidev) +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/lasi.c CVS2_6_14_PA0/drivers/parisc/lasi.c +--- LINUS_2_6_14/drivers/parisc/lasi.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/lasi.c 2005-09-14 06:56:31.000000000 -0600 @@ -175,7 +175,7 @@ return -ENOMEM; @@ -8394,9 +9544,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = lasi_tbl, .probe = lasi_init_chip, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/lba_pci.c CVS2_6_14_RC2_PA6/drivers/parisc/lba_pci.c ---- LINUS_2_6_14_RC2/drivers/parisc/lba_pci.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/lba_pci.c 2005-09-10 12:19:32.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/lba_pci.c CVS2_6_14_PA0/drivers/parisc/lba_pci.c +--- LINUS_2_6_14/drivers/parisc/lba_pci.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/lba_pci.c 2005-09-10 12:19:32.000000000 -0600 @@ -1288,7 +1288,7 @@ ** Adjust "window" for this rope. */ @@ -8454,9 +9604,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd imask <<= 2; /* adjust for hints - 2 more bits */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/led.c CVS2_6_14_RC2_PA6/drivers/parisc/led.c ---- LINUS_2_6_14_RC2/drivers/parisc/led.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/led.c 2005-04-05 13:01:50.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/led.c CVS2_6_14_PA0/drivers/parisc/led.c +--- LINUS_2_6_14/drivers/parisc/led.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/led.c 2005-10-20 08:43:10.000000000 -0600 @@ -18,6 +18,9 @@ * Changes: * - Audit copy_from_user in led_proc_write. @@ -8475,7 +9625,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #include #include #include -@@ -46,25 +50,30 @@ +@@ -47,25 +51,30 @@ #include /* The control of the LEDs and LCDs on PARISC-machines have to be done @@ -8513,7 +9663,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd struct lcd_block { unsigned char command; /* stores the command byte */ unsigned char on; /* value for turning LED on */ -@@ -115,12 +124,27 @@ +@@ -116,12 +125,27 @@ #define LCD_DATA_REG lcd_info.lcd_data_reg_addr #define LED_DATA_REG lcd_info.lcd_cmd_reg_addr /* LASI & ASP only */ @@ -8543,7 +9693,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #ifdef CONFIG_PROC_FS static int led_proc_read(char *page, char **start, off_t off, int count, int *eof, void *data) -@@ -285,52 +309,35 @@ +@@ -286,52 +310,35 @@ /* ** ** led_LCD_driver() @@ -8620,7 +9770,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } } -@@ -355,7 +362,7 @@ +@@ -356,7 +363,7 @@ rx_total = tx_total = 0; @@ -8628,8 +9778,8 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + /* we are running as a workqueue task, so locking dev_base * for reading should be OK */ read_lock(&dev_base_lock); - for (dev = dev_base; dev; dev = dev->next) { -@@ -402,7 +409,7 @@ + rcu_read_lock(); +@@ -405,7 +412,7 @@ static unsigned long last_pgpgin, last_pgpgout; struct page_state pgstat; int changed; @@ -8638,7 +9788,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd get_full_page_state(&pgstat); /* get no of sectors in & out */ /* Just use a very simple calculation here. Do not care about overflow, -@@ -410,86 +417,70 @@ +@@ -413,86 +420,70 @@ changed = (pgstat.pgpgin != last_pgpgin) || (pgstat.pgpgout != last_pgpgout); last_pgpgin = pgstat.pgpgin; last_pgpgout = pgstat.pgpgout; @@ -8756,7 +9906,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* ** led_halt() -@@ -519,9 +510,13 @@ +@@ -522,9 +513,13 @@ default: return NOTIFY_DONE; } @@ -8773,7 +9923,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd if (lcd_info.model == DISPLAY_MODEL_LCD) lcd_print(txt); else -@@ -556,7 +551,6 @@ +@@ -559,7 +554,6 @@ printk(KERN_INFO "LCD display at %lx,%lx registered\n", LCD_CMD_REG , LCD_DATA_REG); led_func_ptr = led_LCD_driver; @@ -8781,7 +9931,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd led_type = LED_HASLCD; break; -@@ -586,9 +580,11 @@ +@@ -589,9 +583,11 @@ initialized++; register_reboot_notifier(&led_notifier); @@ -8796,7 +9946,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return 0; } -@@ -623,8 +619,8 @@ +@@ -626,8 +622,8 @@ ** lcd_print() ** ** Displays the given string on the LCD-Display of newer machines. @@ -8807,7 +9957,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ** */ int lcd_print( char *str ) -@@ -634,12 +630,13 @@ +@@ -637,12 +633,13 @@ if (!led_func_ptr || lcd_info.model != DISPLAY_MODEL_LCD) return 0; @@ -8824,7 +9974,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* Set LCD Cursor to 1st character */ gsc_writeb(lcd_info.reset_cmd1, LCD_CMD_REG); udelay(lcd_info.min_cmd_delay); -@@ -653,8 +650,10 @@ +@@ -656,8 +653,10 @@ udelay(lcd_info.min_cmd_delay); } @@ -8837,9 +9987,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return lcd_info.lcd_width; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/pdc_stable.c CVS2_6_14_RC2_PA6/drivers/parisc/pdc_stable.c ---- LINUS_2_6_14_RC2/drivers/parisc/pdc_stable.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/pdc_stable.c 2005-07-31 23:19:54.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/pdc_stable.c CVS2_6_14_PA0/drivers/parisc/pdc_stable.c +--- LINUS_2_6_14/drivers/parisc/pdc_stable.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/pdc_stable.c 2005-07-31 23:19:54.000000000 -0600 @@ -536,7 +536,7 @@ out += sprintf(out, "Memory tested: "); @@ -8849,9 +9999,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd else out += sprintf(out, "All"); out += sprintf(out, "\n"); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/sba_iommu.c CVS2_6_14_RC2_PA6/drivers/parisc/sba_iommu.c ---- LINUS_2_6_14_RC2/drivers/parisc/sba_iommu.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/sba_iommu.c 2005-10-14 00:02:08.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/sba_iommu.c CVS2_6_14_PA0/drivers/parisc/sba_iommu.c +--- LINUS_2_6_14/drivers/parisc/sba_iommu.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/sba_iommu.c 2005-10-14 00:02:08.000000000 -0600 @@ -91,8 +91,8 @@ #define DBG_RES(x...) #endif @@ -9226,9 +10376,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd sba_dev = kmalloc(sizeof(struct sba_device), GFP_KERNEL); if (!sba_dev) { -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/superio.c CVS2_6_14_RC2_PA6/drivers/parisc/superio.c ---- LINUS_2_6_14_RC2/drivers/parisc/superio.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/superio.c 2005-08-02 20:38:20.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/superio.c CVS2_6_14_PA0/drivers/parisc/superio.c +--- LINUS_2_6_14/drivers/parisc/superio.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/superio.c 2005-08-02 20:38:20.000000000 -0600 @@ -11,6 +11,7 @@ * (C) Copyright 2000 Alex deVries * (C) Copyright 2001 John Marvin @@ -9253,9 +10403,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd retval = early_serial_setup(&serial[1]); if (retval < 0) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parisc/wax.c CVS2_6_14_RC2_PA6/drivers/parisc/wax.c ---- LINUS_2_6_14_RC2/drivers/parisc/wax.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parisc/wax.c 2005-09-10 12:19:32.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parisc/wax.c CVS2_6_14_PA0/drivers/parisc/wax.c +--- LINUS_2_6_14/drivers/parisc/wax.c 2005-10-27 21:30:40.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parisc/wax.c 2005-09-10 12:19:32.000000000 -0600 @@ -81,7 +81,7 @@ return -ENOMEM; @@ -9265,9 +10415,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd wax->version = 0; /* gsc_readb(wax->hpa+WAX_VER); */ printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/parport/parport_gsc.c CVS2_6_14_RC2_PA6/drivers/parport/parport_gsc.c ---- LINUS_2_6_14_RC2/drivers/parport/parport_gsc.c 2005-09-22 19:17:43.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/parport/parport_gsc.c 2005-09-10 12:19:34.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/parport/parport_gsc.c CVS2_6_14_PA0/drivers/parport/parport_gsc.c +--- LINUS_2_6_14/drivers/parport/parport_gsc.c 2005-10-27 21:30:41.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/parport/parport_gsc.c 2005-09-10 12:19:34.000000000 -0600 @@ -359,11 +359,12 @@ unsigned long port; @@ -9283,9 +10433,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* some older machines with ASP-chip don't support * the enhanced parport modes. -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/pcmcia/Kconfig CVS2_6_14_RC2_PA6/drivers/pcmcia/Kconfig ---- LINUS_2_6_14_RC2/drivers/pcmcia/Kconfig 2005-09-22 19:17:45.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/pcmcia/Kconfig 2005-09-14 06:56:33.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/pcmcia/Kconfig CVS2_6_14_PA0/drivers/pcmcia/Kconfig +--- LINUS_2_6_14/drivers/pcmcia/Kconfig 2005-10-27 21:30:41.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/pcmcia/Kconfig 2005-10-20 08:43:11.000000000 -0600 @@ -190,7 +190,11 @@ config PCMCIA_PROBE @@ -9299,9 +10449,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd config M32R_PCC bool "M32R PCMCIA I/F" -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/pcmcia/rsrc_nonstatic.c CVS2_6_14_RC2_PA6/drivers/pcmcia/rsrc_nonstatic.c ---- LINUS_2_6_14_RC2/drivers/pcmcia/rsrc_nonstatic.c 2005-09-22 19:17:45.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/pcmcia/rsrc_nonstatic.c 2005-06-30 08:25:50.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/pcmcia/rsrc_nonstatic.c CVS2_6_14_PA0/drivers/pcmcia/rsrc_nonstatic.c +--- LINUS_2_6_14/drivers/pcmcia/rsrc_nonstatic.c 2005-10-27 21:30:41.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/pcmcia/rsrc_nonstatic.c 2005-10-20 08:43:11.000000000 -0600 @@ -43,7 +43,11 @@ #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444) @@ -9314,9 +10464,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #ifdef CONFIG_PCMCIA_PROBE INT_MODULE_PARM(probe_io, 1); /* IO port probe? */ INT_MODULE_PARM(mem_limit, 0x10000); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/53c700.c CVS2_6_14_RC2_PA6/drivers/scsi/53c700.c ---- LINUS_2_6_14_RC2/drivers/scsi/53c700.c 2005-09-22 19:17:49.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/53c700.c 2005-06-30 08:25:53.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/53c700.c CVS2_6_14_PA0/drivers/scsi/53c700.c +--- LINUS_2_6_14/drivers/scsi/53c700.c 2005-10-27 21:30:42.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/53c700.c 2005-06-30 08:25:53.000000000 -0600 @@ -301,6 +301,7 @@ __u8 *memory; __u32 *script; @@ -9341,9 +10491,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* reset the chip */ NCR_700_chip_reset(host); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/lasi700.c CVS2_6_14_RC2_PA6/drivers/scsi/lasi700.c ---- LINUS_2_6_14_RC2/drivers/scsi/lasi700.c 2005-09-22 19:17:49.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/lasi700.c 2005-09-10 12:19:41.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/lasi700.c CVS2_6_14_PA0/drivers/scsi/lasi700.c +--- LINUS_2_6_14/drivers/scsi/lasi700.c 2005-10-27 21:30:42.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/lasi700.c 2005-09-10 12:19:41.000000000 -0600 @@ -98,7 +98,7 @@ static int __init lasi700_probe(struct parisc_device *dev) @@ -9371,9 +10521,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = lasi700_ids, .probe = lasi700_probe, .remove = __devexit_p(lasi700_driver_remove), -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw.c CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw.c ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-09-22 19:17:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw.c CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw.c +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-10-27 21:30:42.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-09-27 08:18:02.000000000 -0600 @@ -37,11 +37,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -9426,9 +10576,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd SYM_GEN_B(struct SYM_FWB_SCR, start64) SYM_GEN_B(struct SYM_FWB_SCR, pm_handle) }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw.h CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw.h ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw.h 2004-09-09 21:15:32.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw.h 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw.h CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw.h +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw.h 2005-10-27 21:30:42.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw.h 2005-09-27 08:18:02.000000000 -0600 @@ -92,9 +92,6 @@ }; struct sym_fwb_ofs { @@ -9449,9 +10599,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd SYM_GEN_B(u32, start64); SYM_GEN_B(u32, pm_handle); }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw1.h CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw1.h ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw1.h 2004-09-09 21:15:32.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw1.h 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw1.h CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw1.h +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw1.h 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw1.h 2005-09-27 08:18:02.000000000 -0600 @@ -197,12 +197,6 @@ u32 bad_status [ 7]; u32 wsr_ma_helper [ 4]; @@ -9514,9 +10664,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd }/*-------------------------< ZERO >-----------------------------*/,{ SCR_DATA_ZERO, }/*-------------------------< SCRATCH >--------------------------*/,{ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw2.h CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw2.h ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_fw2.h 2004-09-09 21:15:32.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_fw2.h 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw2.h CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw2.h +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_fw2.h 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_fw2.h 2005-09-27 08:18:02.000000000 -0600 @@ -191,13 +191,6 @@ u32 pm_wsr_handle [ 38]; u32 wsr_ma_helper [ 4]; @@ -9583,9 +10733,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd }/*-------------------------< ZERO >-----------------------------*/,{ SCR_DATA_ZERO, }/*-------------------------< SCRATCH >--------------------------*/,{ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_glue.c CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_glue.c ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-09-22 19:17:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_glue.c CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_glue.c +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-09-27 08:18:02.000000000 -0600 @@ -514,9 +514,10 @@ */ int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct sym_ccb *cp) @@ -9774,9 +10924,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .eh_abort_handler = sym53c8xx_eh_abort_handler, .eh_device_reset_handler = sym53c8xx_eh_device_reset_handler, .eh_bus_reset_handler = sym53c8xx_eh_bus_reset_handler, -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_glue.h CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_glue.h ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-09-22 19:17:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_glue.h CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_glue.h +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-09-27 08:18:02.000000000 -0600 @@ -68,7 +68,6 @@ */ #define SYM_CONF_TIMER_INTERVAL ((HZ+1)/2) @@ -9792,9 +10942,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd -void sym_sniff_inquiry(struct sym_hcb *np, struct scsi_cmnd *cmd, int resid); #endif /* SYM_GLUE_H */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_hipd.c CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_hipd.c ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-09-22 19:17:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_hipd.c CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_hipd.c +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-09-27 08:18:02.000000000 -0600 @@ -1519,7 +1519,7 @@ /* * Insert a job into the start queue. @@ -10007,9 +11157,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #if SYM_CONF_MAX_LUN > 1 kfree(tp->lunmp); #endif -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_hipd.h CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_hipd.h ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-09-22 19:17:50.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-09-27 08:18:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_hipd.h CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_hipd.h +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-09-27 08:18:02.000000000 -0600 @@ -46,12 +46,6 @@ * They may be defined in platform specific headers, if they * are useful. @@ -10164,9 +11314,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd * MEMORY ALLOCATOR. */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_malloc.c CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_malloc.c ---- LINUS_2_6_14_RC2/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-03-04 08:35:58.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-09-27 06:03:22.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_malloc.c CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_malloc.c +--- LINUS_2_6_14/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-09-27 06:03:22.000000000 -0600 @@ -37,11 +37,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -10179,9 +11329,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* * Simple power of two buddy-like generic allocator. -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/scsi/zalon.c CVS2_6_14_RC2_PA6/drivers/scsi/zalon.c ---- LINUS_2_6_14_RC2/drivers/scsi/zalon.c 2005-09-22 19:17:49.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/scsi/zalon.c 2005-09-10 12:19:41.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/scsi/zalon.c CVS2_6_14_PA0/drivers/scsi/zalon.c +--- LINUS_2_6_14/drivers/scsi/zalon.c 2005-10-27 21:30:42.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/scsi/zalon.c 2005-09-10 12:19:41.000000000 -0600 @@ -88,7 +88,7 @@ struct gsc_irq gsc_irq; u32 zalon_vers; @@ -10200,9 +11350,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd device.slot.base_v = io_port; device.slot.irq = dev->irq; device.differential = 2; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/serial/8250_gsc.c CVS2_6_14_RC2_PA6/drivers/serial/8250_gsc.c ---- LINUS_2_6_14_RC2/drivers/serial/8250_gsc.c 2005-09-22 19:17:51.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/serial/8250_gsc.c 2005-09-10 12:26:14.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/serial/8250_gsc.c CVS2_6_14_PA0/drivers/serial/8250_gsc.c +--- LINUS_2_6_14/drivers/serial/8250_gsc.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/serial/8250_gsc.c 2005-09-10 12:26:14.000000000 -0600 @@ -29,7 +29,6 @@ static int __init serial_init_chip(struct parisc_device *dev) @@ -10227,9 +11377,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd if (dev->id.sversion != 0x8d) { address += 0x800; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/serial/mux.c CVS2_6_14_RC2_PA6/drivers/serial/mux.c ---- LINUS_2_6_14_RC2/drivers/serial/mux.c 2005-09-22 19:17:51.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/serial/mux.c 2005-09-14 06:56:44.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/serial/mux.c CVS2_6_14_PA0/drivers/serial/mux.c +--- LINUS_2_6_14/drivers/serial/mux.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/serial/mux.c 2005-09-14 06:56:44.000000000 -0600 @@ -27,6 +27,7 @@ #include /* for udelay */ #include @@ -10277,9 +11427,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd .id_table = mux_tbl, .probe = mux_probe, }; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/serial/serial_core.c CVS2_6_14_RC2_PA6/drivers/serial/serial_core.c ---- LINUS_2_6_14_RC2/drivers/serial/serial_core.c 2005-09-22 19:17:51.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/serial/serial_core.c 2005-09-14 06:56:44.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/serial/serial_core.c CVS2_6_14_PA0/drivers/serial/serial_core.c +--- LINUS_2_6_14/drivers/serial/serial_core.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/serial/serial_core.c 2005-09-14 06:56:44.000000000 -0600 @@ -1948,6 +1948,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port) { @@ -10308,9 +11458,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } static void -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/usb/input/hid-core.c CVS2_6_14_RC2_PA6/drivers/usb/input/hid-core.c ---- LINUS_2_6_14_RC2/drivers/usb/input/hid-core.c 2005-09-22 19:17:51.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/usb/input/hid-core.c 2005-09-14 06:56:49.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/usb/input/hid-core.c CVS2_6_14_PA0/drivers/usb/input/hid-core.c +--- LINUS_2_6_14/drivers/usb/input/hid-core.c 2005-10-27 21:30:43.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/usb/input/hid-core.c 2005-10-20 08:43:18.000000000 -0600 @@ -760,21 +760,31 @@ } @@ -10350,9 +11500,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } /* -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/video/console/Kconfig CVS2_6_14_RC2_PA6/drivers/video/console/Kconfig ---- LINUS_2_6_14_RC2/drivers/video/console/Kconfig 2005-09-22 19:17:53.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/video/console/Kconfig 2005-09-14 06:56:57.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/video/console/Kconfig CVS2_6_14_PA0/drivers/video/console/Kconfig +--- LINUS_2_6_14/drivers/video/console/Kconfig 2005-10-27 21:30:44.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/video/console/Kconfig 2005-09-14 06:56:57.000000000 -0600 @@ -110,7 +110,7 @@ config FONTS @@ -10389,9 +11539,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd default y if !SPARC32 && !SPARC64 && !FONTS && MAC help Small console font with Macintosh-style high-half glyphs. Some Mac -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/drivers/video/console/sticore.c CVS2_6_14_RC2_PA6/drivers/video/console/sticore.c ---- LINUS_2_6_14_RC2/drivers/video/console/sticore.c 2005-09-22 19:17:54.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/drivers/video/console/sticore.c 2005-09-10 12:30:10.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/drivers/video/console/sticore.c CVS2_6_14_PA0/drivers/video/console/sticore.c +--- LINUS_2_6_14/drivers/video/console/sticore.c 2005-10-27 21:30:44.000000000 -0600 ++++ CVS2_6_14_PA0/drivers/video/console/sticore.c 2005-09-10 12:30:10.000000000 -0600 @@ -511,12 +511,12 @@ struct sti_cooked_font *cooked_font; @@ -10630,9 +11780,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return 0; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/fs/ioctl.c CVS2_6_14_RC2_PA6/fs/ioctl.c ---- LINUS_2_6_14_RC2/fs/ioctl.c 2005-09-22 19:17:55.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/fs/ioctl.c 2005-03-14 06:24:36.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/fs/ioctl.c CVS2_6_14_PA0/fs/ioctl.c +--- LINUS_2_6_14/fs/ioctl.c 2005-10-27 21:30:44.000000000 -0600 ++++ CVS2_6_14_PA0/fs/ioctl.c 2005-03-14 06:24:36.000000000 -0700 @@ -71,7 +71,11 @@ return -EBADF; return put_user(inode->i_sb->s_blocksize, p); @@ -10646,9 +11796,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } return do_ioctl(filp, cmd, arg); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-generic/compat_signal.h CVS2_6_14_RC2_PA6/include/asm-generic/compat_signal.h ---- LINUS_2_6_14_RC2/include/asm-generic/compat_signal.h 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/include/asm-generic/compat_signal.h 2004-01-27 22:12:47.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-generic/compat_signal.h CVS2_6_14_PA0/include/asm-generic/compat_signal.h +--- LINUS_2_6_14/include/asm-generic/compat_signal.h 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/include/asm-generic/compat_signal.h 2004-01-27 22:12:47.000000000 -0700 @@ -0,0 +1,25 @@ +#ifndef _ASM_GENERIC_COMPAT_SIGNAL_H +#define _ASM_GENERIC_COMPAT_SIGNAL_H @@ -10675,9 +11825,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + +#endif /* !__ASSEMBLY__ */ +#endif /* !_ASM_GENERIC_COMPAT_SIGNAL_H */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-ia64/compat.h CVS2_6_14_RC2_PA6/include/asm-ia64/compat.h ---- LINUS_2_6_14_RC2/include/asm-ia64/compat.h 2005-09-22 19:18:05.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-ia64/compat.h 2005-09-14 06:57:31.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-ia64/compat.h CVS2_6_14_PA0/include/asm-ia64/compat.h +--- LINUS_2_6_14/include/asm-ia64/compat.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-ia64/compat.h 2005-09-14 06:57:31.000000000 -0600 @@ -15,6 +15,9 @@ typedef s32 compat_pid_t; typedef u16 __compat_uid_t; @@ -10688,9 +11838,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd typedef u32 __compat_uid32_t; typedef u32 __compat_gid32_t; typedef u16 compat_mode_t; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/assembly.h CVS2_6_14_RC2_PA6/include/asm-parisc/assembly.h ---- LINUS_2_6_14_RC2/include/asm-parisc/assembly.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/assembly.h 2005-09-25 19:23:05.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/assembly.h CVS2_6_14_PA0/include/asm-parisc/assembly.h +--- LINUS_2_6_14/include/asm-parisc/assembly.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/assembly.h 2005-09-25 19:23:05.000000000 -0600 @@ -21,7 +21,9 @@ #ifndef _PARISC_ASSEMBLY_H #define _PARISC_ASSEMBLY_H @@ -10819,9 +11969,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + #endif /* __ASSEMBLY__ */ #endif -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/bitops.h CVS2_6_14_RC2_PA6/include/asm-parisc/bitops.h ---- LINUS_2_6_14_RC2/include/asm-parisc/bitops.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/bitops.h 2005-09-14 07:22:22.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/bitops.h CVS2_6_14_PA0/include/asm-parisc/bitops.h +--- LINUS_2_6_14/include/asm-parisc/bitops.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/bitops.h 2005-09-14 07:22:22.000000000 -0600 @@ -2,7 +2,7 @@ #define _PARISC_BITOPS_H @@ -11282,9 +12432,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* Bitmap functions for the minix filesystem. */ #define minix_test_and_set_bit(nr,addr) ext2_set_bit(nr,addr) #define minix_set_bit(nr,addr) ((void)ext2_set_bit(nr,addr)) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/errno.h CVS2_6_14_RC2_PA6/include/asm-parisc/errno.h ---- LINUS_2_6_14_RC2/include/asm-parisc/errno.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/errno.h 2005-05-08 20:00:54.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/errno.h CVS2_6_14_PA0/include/asm-parisc/errno.h +--- LINUS_2_6_14/include/asm-parisc/errno.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/errno.h 2005-05-08 20:00:54.000000000 -0600 @@ -114,6 +114,7 @@ #define ENOTSUP 252 /* Function not implemented (POSIX.4 / HPUX) */ @@ -11293,9 +12443,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* for robust mutexes */ #define EOWNERDEAD 254 /* Owner died */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/grfioctl.h CVS2_6_14_RC2_PA6/include/asm-parisc/grfioctl.h ---- LINUS_2_6_14_RC2/include/asm-parisc/grfioctl.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/grfioctl.h 2005-07-31 16:24:55.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/grfioctl.h CVS2_6_14_PA0/include/asm-parisc/grfioctl.h +--- LINUS_2_6_14/include/asm-parisc/grfioctl.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/grfioctl.h 2005-07-31 16:24:55.000000000 -0600 @@ -69,6 +69,8 @@ #define CRT_ID_TVRX S9000_ID_98765 /* TVRX (gto/falcon) */ #define CRT_ID_ARTIST S9000_ID_ARTIST /* Artist */ @@ -11305,9 +12455,33 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* structure for ioctl(GCDESCRIBE) */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/led.h CVS2_6_14_RC2_PA6/include/asm-parisc/led.h ---- LINUS_2_6_14_RC2/include/asm-parisc/led.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/led.h 2005-03-27 23:50:20.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/irq.h CVS2_6_14_PA0/include/asm-parisc/irq.h +--- LINUS_2_6_14/include/asm-parisc/irq.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/irq.h 2005-10-19 13:55:33.000000000 -0600 +@@ -8,6 +8,7 @@ + #define _ASM_PARISC_IRQ_H + + #include ++#include + #include + + #define NO_IRQ (-1) +@@ -49,10 +50,10 @@ + extern int txn_claim_irq(int); + extern unsigned int txn_alloc_data(unsigned int); + extern unsigned long txn_alloc_addr(unsigned int); ++extern unsigned long txn_affinity_addr(unsigned int irq, int cpu); + + extern int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *, void *); +- +-extern int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *, void *); ++extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest); + + /* soft power switch support (power.c) */ + extern struct tasklet_struct power_tasklet; +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/led.h CVS2_6_14_PA0/include/asm-parisc/led.h +--- LINUS_2_6_14/include/asm-parisc/led.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/led.h 2005-03-27 23:50:20.000000000 -0700 @@ -23,9 +23,6 @@ #define LED_CMD_REG_NONE 0 /* NULL == no addr for the cmd register */ @@ -11318,9 +12492,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* register_led_driver() */ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long data_reg); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/parisc-device.h CVS2_6_14_RC2_PA6/include/asm-parisc/parisc-device.h ---- LINUS_2_6_14_RC2/include/asm-parisc/parisc-device.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/parisc-device.h 2005-09-10 12:12:02.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/parisc-device.h CVS2_6_14_PA0/include/asm-parisc/parisc-device.h +--- LINUS_2_6_14/include/asm-parisc/parisc-device.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/parisc-device.h 2005-09-10 12:12:02.000000000 -0600 @@ -1,7 +1,7 @@ #include @@ -11342,9 +12516,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd static inline void parisc_set_drvdata(struct parisc_device *d, void *p) { -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/pci.h CVS2_6_14_RC2_PA6/include/asm-parisc/pci.h ---- LINUS_2_6_14_RC2/include/asm-parisc/pci.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/pci.h 2005-09-14 07:21:28.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/pci.h CVS2_6_14_PA0/include/asm-parisc/pci.h +--- LINUS_2_6_14/include/asm-parisc/pci.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/pci.h 2005-09-14 07:21:28.000000000 -0600 @@ -69,7 +69,7 @@ #define PCI_PORT_HBA(a) ((a) >> HBA_PORT_SPACE_BITS) #define PCI_PORT_ADDR(a) ((a) & (HBA_PORT_SPACE_SIZE - 1)) @@ -11354,9 +12528,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define PCI_F_EXTEND 0xffffffff00000000UL #define PCI_IS_LMMIO(hba,a) pci_is_lmmio(hba,a) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/pgtable.h CVS2_6_14_RC2_PA6/include/asm-parisc/pgtable.h ---- LINUS_2_6_14_RC2/include/asm-parisc/pgtable.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/pgtable.h 2005-09-23 21:43:51.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/pgtable.h CVS2_6_14_PA0/include/asm-parisc/pgtable.h +--- LINUS_2_6_14/include/asm-parisc/pgtable.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/pgtable.h 2005-09-23 21:43:51.000000000 -0600 @@ -501,6 +501,8 @@ #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ remap_pfn_range(vma, vaddr, pfn, size, prot) @@ -11366,9 +12540,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define MK_IOSPACE_PFN(space, pfn) (pfn) #define GET_IOSPACE(pfn) 0 #define GET_PFN(pfn) (pfn) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/processor.h CVS2_6_14_RC2_PA6/include/asm-parisc/processor.h ---- LINUS_2_6_14_RC2/include/asm-parisc/processor.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/processor.h 2005-09-14 06:57:40.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/processor.h CVS2_6_14_PA0/include/asm-parisc/processor.h +--- LINUS_2_6_14/include/asm-parisc/processor.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/processor.h 2005-09-14 06:57:40.000000000 -0600 @@ -122,8 +122,27 @@ }; @@ -11397,9 +12571,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define INIT_THREAD { \ regs: { gr: { 0, }, \ fr: { 0, }, \ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/psw.h CVS2_6_14_RC2_PA6/include/asm-parisc/psw.h ---- LINUS_2_6_14_RC2/include/asm-parisc/psw.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/psw.h 2005-05-12 22:39:05.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/psw.h CVS2_6_14_PA0/include/asm-parisc/psw.h +--- LINUS_2_6_14/include/asm-parisc/psw.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/psw.h 2005-05-12 22:39:05.000000000 -0600 @@ -1,4 +1,7 @@ #ifndef _PARISC_PSW_H + @@ -11472,9 +12646,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +#define USER_PSW (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I) + #endif -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/ptrace.h CVS2_6_14_RC2_PA6/include/asm-parisc/ptrace.h ---- LINUS_2_6_14_RC2/include/asm-parisc/ptrace.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/ptrace.h 2005-03-31 08:27:13.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/ptrace.h CVS2_6_14_PA0/include/asm-parisc/ptrace.h +--- LINUS_2_6_14/include/asm-parisc/ptrace.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/ptrace.h 2005-03-31 08:27:13.000000000 -0700 @@ -49,7 +49,7 @@ #define user_mode(regs) (((regs)->iaoq[0] & 3) ? 1 : 0) #define user_space(regs) (((regs)->iasq[1] != 0) ? 1 : 0) @@ -11484,9 +12658,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd extern void show_regs(struct pt_regs *); #endif -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/smp.h CVS2_6_14_RC2_PA6/include/asm-parisc/smp.h ---- LINUS_2_6_14_RC2/include/asm-parisc/smp.h 2005-06-30 08:26:22.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/smp.h 2005-10-18 12:06:36.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/smp.h CVS2_6_14_PA0/include/asm-parisc/smp.h +--- LINUS_2_6_14/include/asm-parisc/smp.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/smp.h 2005-10-18 18:30:05.000000000 -0600 @@ -29,6 +29,7 @@ #define cpu_logical_map(cpu) (cpu) @@ -11495,10 +12669,23 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #endif /* !ASSEMBLY */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/spinlock.h CVS2_6_14_RC2_PA6/include/asm-parisc/spinlock.h ---- LINUS_2_6_14_RC2/include/asm-parisc/spinlock.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/spinlock.h 2005-09-14 08:42:11.000000000 -0600 -@@ -5,11 +5,6 @@ +@@ -53,7 +54,11 @@ + + #define raw_smp_processor_id() (current_thread_info()->cpu) + +-#endif /* CONFIG_SMP */ ++#else /* CONFIG_SMP */ ++ ++static inline void smp_send_all_nop(void) { return; } ++ ++#endif + + #define NO_PROC_ID 0xFF /* No processor magic marker */ + #define ANY_PROC_ID 0xFF /* Any processor magic marker */ +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/spinlock.h CVS2_6_14_PA0/include/asm-parisc/spinlock.h +--- LINUS_2_6_14/include/asm-parisc/spinlock.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/spinlock.h 2005-10-20 10:07:04.000000000 -0600 +@@ -5,29 +5,31 @@ #include #include @@ -11510,9 +12697,64 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd static inline int __raw_spin_is_locked(raw_spinlock_t *x) { volatile unsigned int *a = __ldcw_align(x); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/spinlock_types.h CVS2_6_14_RC2_PA6/include/asm-parisc/spinlock_types.h ---- LINUS_2_6_14_RC2/include/asm-parisc/spinlock_types.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/spinlock_types.h 2005-09-27 09:22:08.000000000 -0600 + return *a == 0; + } + +-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock) ++#define __raw_spin_lock(lock) __raw_spin_lock_flags(lock, 0) + #define __raw_spin_unlock_wait(x) \ + do { cpu_relax(); } while (__raw_spin_is_locked(x)) + +-static inline void __raw_spin_lock(raw_spinlock_t *x) ++static inline void __raw_spin_lock_flags(raw_spinlock_t *x, ++ unsigned long flags) + { + volatile unsigned int *a; + + mb(); + a = __ldcw_align(x); + while (__ldcw(a) == 0) +- while (*a == 0); ++ while (*a == 0) ++ if (flags & PSW_SM_I) { ++ local_irq_enable(); ++ cpu_relax(); ++ local_irq_disable(); ++ } else ++ cpu_relax(); + mb(); + } + +@@ -65,26 +67,20 @@ + + static __inline__ void __raw_read_lock(raw_rwlock_t *rw) + { +- unsigned long flags; +- local_irq_save(flags); + __raw_spin_lock(&rw->lock); + + rw->counter++; + + __raw_spin_unlock(&rw->lock); +- local_irq_restore(flags); + } + + static __inline__ void __raw_read_unlock(raw_rwlock_t *rw) + { +- unsigned long flags; +- local_irq_save(flags); + __raw_spin_lock(&rw->lock); + + rw->counter--; + + __raw_spin_unlock(&rw->lock); +- local_irq_restore(flags); + } + + /* write_lock is less trivial. We optimistically grab the lock and check +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/spinlock_types.h CVS2_6_14_PA0/include/asm-parisc/spinlock_types.h +--- LINUS_2_6_14/include/asm-parisc/spinlock_types.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/spinlock_types.h 2005-09-27 09:22:08.000000000 -0600 @@ -6,11 +6,15 @@ #endif @@ -11531,9 +12773,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd typedef struct { raw_spinlock_t lock; volatile int counter; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/system.h CVS2_6_14_RC2_PA6/include/asm-parisc/system.h ---- LINUS_2_6_14_RC2/include/asm-parisc/system.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/system.h 2005-09-14 06:57:40.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/system.h CVS2_6_14_PA0/include/asm-parisc/system.h +--- LINUS_2_6_14/include/asm-parisc/system.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/system.h 2005-09-14 06:57:40.000000000 -0600 @@ -138,13 +138,7 @@ #define set_wmb(var, value) do { var = value; wmb(); } while (0) @@ -11610,9 +12852,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define arch_align_stack(x) (x) #endif -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/tlbflush.h CVS2_6_14_RC2_PA6/include/asm-parisc/tlbflush.h ---- LINUS_2_6_14_RC2/include/asm-parisc/tlbflush.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/tlbflush.h 2005-06-04 01:11:25.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/tlbflush.h CVS2_6_14_PA0/include/asm-parisc/tlbflush.h +--- LINUS_2_6_14/include/asm-parisc/tlbflush.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/tlbflush.h 2005-06-04 01:11:25.000000000 -0600 @@ -7,6 +7,26 @@ #include #include @@ -11673,9 +12915,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd } } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/types.h CVS2_6_14_RC2_PA6/include/asm-parisc/types.h ---- LINUS_2_6_14_RC2/include/asm-parisc/types.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/types.h 2005-09-14 06:57:40.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/types.h CVS2_6_14_PA0/include/asm-parisc/types.h +--- LINUS_2_6_14/include/asm-parisc/types.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/types.h 2005-09-14 06:57:40.000000000 -0600 @@ -33,8 +33,10 @@ #ifdef __LP64__ @@ -11687,9 +12929,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #endif #ifndef __ASSEMBLY__ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-parisc/unistd.h CVS2_6_14_RC2_PA6/include/asm-parisc/unistd.h ---- LINUS_2_6_14_RC2/include/asm-parisc/unistd.h 2005-09-22 19:18:07.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-parisc/unistd.h 2005-09-21 22:26:33.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-parisc/unistd.h CVS2_6_14_PA0/include/asm-parisc/unistd.h +--- LINUS_2_6_14/include/asm-parisc/unistd.h 2005-10-27 21:30:46.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-parisc/unistd.h 2005-09-21 22:26:33.000000000 -0600 @@ -687,8 +687,8 @@ #define __NR_shmget (__NR_Linux + 194) #define __NR_shmctl (__NR_Linux + 195) @@ -11730,9 +12972,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd K_STW_ASM_PIC \ " ble 0x100(%%sr2, %%r0)\n" \ " ldi %1, %%r20\n" \ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-s390/compat.h CVS2_6_14_RC2_PA6/include/asm-s390/compat.h ---- LINUS_2_6_14_RC2/include/asm-s390/compat.h 2005-09-22 19:18:09.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-s390/compat.h 2005-09-14 06:57:44.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-s390/compat.h CVS2_6_14_PA0/include/asm-s390/compat.h +--- LINUS_2_6_14/include/asm-s390/compat.h 2005-10-27 21:30:47.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-s390/compat.h 2005-09-14 06:57:44.000000000 -0600 @@ -15,6 +15,9 @@ typedef s32 compat_pid_t; typedef u16 __compat_uid_t; @@ -11743,9 +12985,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd typedef u32 __compat_uid32_t; typedef u32 __compat_gid32_t; typedef u16 compat_mode_t; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/asm-sparc64/compat.h CVS2_6_14_RC2_PA6/include/asm-sparc64/compat.h ---- LINUS_2_6_14_RC2/include/asm-sparc64/compat.h 2005-09-22 19:18:11.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/asm-sparc64/compat.h 2005-09-14 06:57:45.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/asm-sparc64/compat.h CVS2_6_14_PA0/include/asm-sparc64/compat.h +--- LINUS_2_6_14/include/asm-sparc64/compat.h 2005-10-27 21:30:47.000000000 -0600 ++++ CVS2_6_14_PA0/include/asm-sparc64/compat.h 2005-09-14 06:57:45.000000000 -0600 @@ -14,6 +14,9 @@ typedef s32 compat_pid_t; typedef u16 __compat_uid_t; @@ -11756,9 +12998,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd typedef u32 __compat_uid32_t; typedef u32 __compat_gid32_t; typedef u16 compat_mode_t; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/compat.h CVS2_6_14_RC2_PA6/include/linux/compat.h ---- LINUS_2_6_14_RC2/include/linux/compat.h 2005-09-22 19:18:13.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/linux/compat.h 2005-09-14 06:57:49.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/compat.h CVS2_6_14_PA0/include/linux/compat.h +--- LINUS_2_6_14/include/linux/compat.h 2005-10-27 21:30:48.000000000 -0600 ++++ CVS2_6_14_PA0/include/linux/compat.h 2005-09-14 06:57:49.000000000 -0600 @@ -6,10 +6,16 @@ */ #include @@ -11829,9 +13071,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #endif /* CONFIG_COMPAT */ #endif /* _LINUX_COMPAT_H */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/compat_siginfo.h CVS2_6_14_RC2_PA6/include/linux/compat_siginfo.h ---- LINUS_2_6_14_RC2/include/linux/compat_siginfo.h 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/include/linux/compat_siginfo.h 2005-08-02 08:33:30.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/compat_siginfo.h CVS2_6_14_PA0/include/linux/compat_siginfo.h +--- LINUS_2_6_14/include/linux/compat_siginfo.h 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/include/linux/compat_siginfo.h 2005-08-02 08:33:30.000000000 -0600 @@ -0,0 +1,182 @@ +#ifndef _ASM_GENERIC_COMPAT_SIGINFO_H +#define _ASM_GENERIC_COMPAT_SIGINFO_H @@ -12015,9 +13257,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +#endif /* CONFIG_COMPAT */ +#endif /* _ASM_GENERIC_COMPAT_SIGINFO_H */ + -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/hil.h CVS2_6_14_RC2_PA6/include/linux/hil.h ---- LINUS_2_6_14_RC2/include/linux/hil.h 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/include/linux/hil.h 2004-10-31 14:05:59.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/hil.h CVS2_6_14_PA0/include/linux/hil.h +--- LINUS_2_6_14/include/linux/hil.h 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/include/linux/hil.h 2004-10-31 14:05:59.000000000 -0700 @@ -0,0 +1,483 @@ +#ifndef _HIL_H_ +#define _HIL_H_ @@ -12502,9 +13744,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + + +#endif /* _HIL_H_ */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/hil_mlc.h CVS2_6_14_RC2_PA6/include/linux/hil_mlc.h ---- LINUS_2_6_14_RC2/include/linux/hil_mlc.h 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/include/linux/hil_mlc.h 2004-10-30 13:51:51.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/hil_mlc.h CVS2_6_14_PA0/include/linux/hil_mlc.h +--- LINUS_2_6_14/include/linux/hil_mlc.h 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/include/linux/hil_mlc.h 2004-10-30 13:51:51.000000000 -0600 @@ -0,0 +1,168 @@ +/* + * HP Human Interface Loop Master Link Controller driver. @@ -12674,9 +13916,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd + +int hil_mlc_register(hil_mlc *mlc); +int hil_mlc_unregister(hil_mlc *mlc); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/hp_sdc.h CVS2_6_14_RC2_PA6/include/linux/hp_sdc.h ---- LINUS_2_6_14_RC2/include/linux/hp_sdc.h 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/include/linux/hp_sdc.h 2004-07-11 16:03:48.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/hp_sdc.h CVS2_6_14_PA0/include/linux/hp_sdc.h +--- LINUS_2_6_14/include/linux/hp_sdc.h 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/include/linux/hp_sdc.h 2004-07-11 16:03:48.000000000 -0600 @@ -0,0 +1,300 @@ +/* + * HP i8042 System Device Controller -- header @@ -12978,9 +14220,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +} hp_i8042_sdc; + +#endif /* _LINUX_HP_SDC_H */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/input.h CVS2_6_14_RC2_PA6/include/linux/input.h ---- LINUS_2_6_14_RC2/include/linux/input.h 2005-09-22 19:18:13.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/linux/input.h 2005-09-14 06:57:49.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/input.h CVS2_6_14_PA0/include/linux/input.h +--- LINUS_2_6_14/include/linux/input.h 2005-10-27 21:30:48.000000000 -0600 ++++ CVS2_6_14_PA0/include/linux/input.h 2005-09-14 06:57:49.000000000 -0600 @@ -644,6 +644,7 @@ #define BUS_ADB 0x17 #define BUS_I2C 0x18 @@ -12989,9 +14231,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* * Values describing the status of an effect -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/serio.h CVS2_6_14_RC2_PA6/include/linux/serio.h ---- LINUS_2_6_14_RC2/include/linux/serio.h 2005-09-22 19:18:13.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/linux/serio.h 2005-06-30 08:26:28.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/serio.h CVS2_6_14_PA0/include/linux/serio.h +--- LINUS_2_6_14/include/linux/serio.h 2005-10-27 21:30:48.000000000 -0600 ++++ CVS2_6_14_PA0/include/linux/serio.h 2005-06-30 08:26:28.000000000 -0600 @@ -185,7 +185,7 @@ #define SERIO_8042_XL 0x06 @@ -13001,9 +14243,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd */ #define SERIO_UNKNOWN 0x00 #define SERIO_MSC 0x01 -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/linux/signal.h CVS2_6_14_RC2_PA6/include/linux/signal.h ---- LINUS_2_6_14_RC2/include/linux/signal.h 2005-09-22 19:18:13.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/linux/signal.h 2005-06-17 21:32:55.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/linux/signal.h CVS2_6_14_PA0/include/linux/signal.h +--- LINUS_2_6_14/include/linux/signal.h 2005-10-27 21:30:48.000000000 -0600 ++++ CVS2_6_14_PA0/include/linux/signal.h 2005-06-17 21:32:55.000000000 -0600 @@ -234,6 +234,9 @@ struct pt_regs; extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie); @@ -13014,9 +14256,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/include/sound/opl3.h CVS2_6_14_RC2_PA6/include/sound/opl3.h ---- LINUS_2_6_14_RC2/include/sound/opl3.h 2005-09-22 19:18:16.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/include/sound/opl3.h 2005-09-13 18:31:04.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/include/sound/opl3.h CVS2_6_14_PA0/include/sound/opl3.h +--- LINUS_2_6_14/include/sound/opl3.h 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/include/sound/opl3.h 2005-09-13 18:31:04.000000000 -0600 @@ -261,10 +261,11 @@ } snd_opl3_voice_t; @@ -13041,9 +14283,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd int snd_opl3_create(snd_card_t * card, unsigned long l_port, unsigned long r_port, unsigned short hardware, -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/ipc/compat_mq.c CVS2_6_14_RC2_PA6/ipc/compat_mq.c ---- LINUS_2_6_14_RC2/ipc/compat_mq.c 2005-09-22 19:18:17.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/ipc/compat_mq.c 2005-03-18 06:17:54.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/ipc/compat_mq.c CVS2_6_14_PA0/ipc/compat_mq.c +--- LINUS_2_6_14/ipc/compat_mq.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/ipc/compat_mq.c 2005-03-18 06:17:54.000000000 -0700 @@ -7,6 +7,7 @@ */ @@ -13052,9 +14294,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #include #include #include -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/Makefile CVS2_6_14_RC2_PA6/kernel/Makefile ---- LINUS_2_6_14_RC2/kernel/Makefile 2005-09-22 19:18:17.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/Makefile 2005-09-14 06:57:58.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/Makefile CVS2_6_14_PA0/kernel/Makefile +--- LINUS_2_6_14/kernel/Makefile 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/Makefile 2005-09-14 06:57:58.000000000 -0600 @@ -19,7 +19,7 @@ obj-$(CONFIG_PM) += power/ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o @@ -13064,9 +14306,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd obj-$(CONFIG_CPUSETS) += cpuset.o obj-$(CONFIG_IKCONFIG) += configs.o obj-$(CONFIG_IKCONFIG_PROC) += configs.o -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/compat.c CVS2_6_14_RC2_PA6/kernel/compat.c ---- LINUS_2_6_14_RC2/kernel/compat.c 2005-09-22 19:18:17.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/compat.c 2005-09-14 06:57:58.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/compat.c CVS2_6_14_PA0/kernel/compat.c +--- LINUS_2_6_14/kernel/compat.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/compat.c 2005-09-14 06:57:58.000000000 -0600 @@ -13,6 +13,7 @@ #include @@ -13142,9 +14384,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd ret = -EFAULT; } }else { -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/compat_signal.c CVS2_6_14_RC2_PA6/kernel/compat_signal.c ---- LINUS_2_6_14_RC2/kernel/compat_signal.c 1969-12-31 17:00:00.000000000 -0700 -+++ CVS2_6_14_RC2_PA6/kernel/compat_signal.c 2005-08-02 10:22:04.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/compat_signal.c CVS2_6_14_PA0/kernel/compat_signal.c +--- LINUS_2_6_14/kernel/compat_signal.c 1969-12-31 17:00:00.000000000 -0700 ++++ CVS2_6_14_PA0/kernel/compat_signal.c 2005-08-02 10:22:04.000000000 -0600 @@ -0,0 +1,280 @@ +/* + * Copyright (C) 2003 Carlos O'Donell @@ -13426,10 +14668,23 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd +} +#endif + -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/posix-cpu-timers.c CVS2_6_14_RC2_PA6/kernel/posix-cpu-timers.c ---- LINUS_2_6_14_RC2/kernel/posix-cpu-timers.c 2005-09-22 19:18:18.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/posix-cpu-timers.c 2005-04-04 14:47:32.000000000 -0600 -@@ -1270,8 +1270,6 @@ +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/irq/manage.c CVS2_6_14_PA0/kernel/irq/manage.c +--- LINUS_2_6_14/kernel/irq/manage.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/irq/manage.c 2005-10-19 16:15:39.000000000 -0600 +@@ -35,6 +35,9 @@ + { + struct irq_desc *desc = irq_desc + irq; + ++ if (irq >= NR_IRQS) ++ return; ++ + while (desc->status & IRQ_INPROGRESS) + cpu_relax(); + } +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/posix-cpu-timers.c CVS2_6_14_PA0/kernel/posix-cpu-timers.c +--- LINUS_2_6_14/kernel/posix-cpu-timers.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/posix-cpu-timers.c 2005-10-27 21:38:45.000000000 -0600 +@@ -1283,8 +1283,6 @@ LIST_HEAD(firing); struct k_itimer *timer, *next; @@ -13438,9 +14693,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define UNEXPIRED(clock) \ (cputime_eq(tsk->it_##clock##_expires, cputime_zero) || \ cputime_lt(clock##_ticks(tsk), tsk->it_##clock##_expires)) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/ptrace.c CVS2_6_14_RC2_PA6/kernel/ptrace.c ---- LINUS_2_6_14_RC2/kernel/ptrace.c 2005-09-22 19:18:18.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/ptrace.c 2005-09-14 06:57:58.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/ptrace.c CVS2_6_14_PA0/kernel/ptrace.c +--- LINUS_2_6_14/kernel/ptrace.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/ptrace.c 2005-09-14 06:57:58.000000000 -0600 @@ -359,7 +359,7 @@ siginfo_t newinfo; int error = -ESRCH; @@ -13450,9 +14705,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return -EFAULT; read_lock(&tasklist_lock); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/resource.c CVS2_6_14_RC2_PA6/kernel/resource.c ---- LINUS_2_6_14_RC2/kernel/resource.c 2005-09-22 19:18:18.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/resource.c 2005-09-14 06:57:58.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/resource.c CVS2_6_14_PA0/kernel/resource.c +--- LINUS_2_6_14/kernel/resource.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/resource.c 2005-09-14 06:57:58.000000000 -0600 @@ -181,6 +181,8 @@ { struct resource *tmp, **p; @@ -13462,9 +14717,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd p = &old->parent->child; for (;;) { tmp = *p; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/signal.c CVS2_6_14_RC2_PA6/kernel/signal.c ---- LINUS_2_6_14_RC2/kernel/signal.c 2005-09-22 19:18:18.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/signal.c 2005-09-14 06:57:58.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/signal.c CVS2_6_14_PA0/kernel/signal.c +--- LINUS_2_6_14/kernel/signal.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/signal.c 2005-10-27 21:38:45.000000000 -0600 @@ -22,6 +22,7 @@ #include #include @@ -13473,7 +14728,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #include #include #include -@@ -2106,17 +2107,35 @@ +@@ -2127,17 +2128,35 @@ return do_sigpending(set, sigsetsize); } @@ -13509,7 +14764,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd /* * If you change siginfo_t structure, please be sure * this code is fixed accordingly. -@@ -2353,7 +2372,7 @@ +@@ -2374,7 +2393,7 @@ { siginfo_t info; @@ -13518,9 +14773,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd return -EFAULT; /* Not even root can pretend to send signals from the kernel. -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/kernel/sys.c CVS2_6_14_RC2_PA6/kernel/sys.c ---- LINUS_2_6_14_RC2/kernel/sys.c 2005-09-22 19:18:18.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/kernel/sys.c 2005-09-23 21:43:57.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/kernel/sys.c CVS2_6_14_PA0/kernel/sys.c +--- LINUS_2_6_14/kernel/sys.c 2005-10-27 21:30:49.000000000 -0600 ++++ CVS2_6_14_PA0/kernel/sys.c 2005-10-20 08:43:41.000000000 -0600 @@ -32,6 +32,7 @@ #include #include @@ -13529,9 +14784,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #include #include #include -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/mm/shmem.c CVS2_6_14_RC2_PA6/mm/shmem.c ---- LINUS_2_6_14_RC2/mm/shmem.c 2005-09-22 19:18:19.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/mm/shmem.c 2005-09-14 06:58:00.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/mm/shmem.c CVS2_6_14_PA0/mm/shmem.c +--- LINUS_2_6_14/mm/shmem.c 2005-10-27 21:30:50.000000000 -0600 ++++ CVS2_6_14_PA0/mm/shmem.c 2005-10-20 08:43:42.000000000 -0600 @@ -459,7 +459,7 @@ } while (next); } @@ -13541,9 +14796,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd { struct shmem_inode_info *info = SHMEM_I(inode); unsigned long idx; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/drivers/opl3/opl3_lib.c CVS2_6_14_RC2_PA6/sound/drivers/opl3/opl3_lib.c ---- LINUS_2_6_14_RC2/sound/drivers/opl3/opl3_lib.c 2005-09-22 19:18:30.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/drivers/opl3/opl3_lib.c 2005-09-23 21:44:05.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/drivers/opl3/opl3_lib.c CVS2_6_14_PA0/sound/drivers/opl3/opl3_lib.c +--- LINUS_2_6_14/sound/drivers/opl3/opl3_lib.c 2005-10-27 21:30:53.000000000 -0600 ++++ CVS2_6_14_PA0/sound/drivers/opl3/opl3_lib.c 2005-09-23 21:44:05.000000000 -0600 @@ -40,7 +40,7 @@ static void snd_opl2_command(opl3_t * opl3, unsigned short cmd, unsigned char val) { @@ -13756,9 +15011,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd EXPORT_SYMBOL(snd_opl3_timer_new); EXPORT_SYMBOL(snd_opl3_hwdep_new); -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/oss/ad1889.c CVS2_6_14_RC2_PA6/sound/oss/ad1889.c ---- LINUS_2_6_14_RC2/sound/oss/ad1889.c 2005-09-22 19:18:35.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/oss/ad1889.c 2005-06-30 08:26:47.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/oss/ad1889.c CVS2_6_14_PA0/sound/oss/ad1889.c +--- LINUS_2_6_14/sound/oss/ad1889.c 2005-10-27 21:30:53.000000000 -0600 ++++ CVS2_6_14_PA0/sound/oss/ad1889.c 2005-06-30 08:26:47.000000000 -0600 @@ -74,7 +74,7 @@ DBG("Setting WAV rate to %d\n", rate); @@ -14150,9 +15405,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd if (!dev->regbase) { printk(KERN_ERR DEVNAME ": unable to remap iomem\n"); goto out2; -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/oss/ad1889.h CVS2_6_14_RC2_PA6/sound/oss/ad1889.h ---- LINUS_2_6_14_RC2/sound/oss/ad1889.h 2005-09-22 19:18:35.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/oss/ad1889.h 2005-03-01 16:00:56.000000000 -0700 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/oss/ad1889.h CVS2_6_14_PA0/sound/oss/ad1889.h +--- LINUS_2_6_14/sound/oss/ad1889.h 2005-10-27 21:30:53.000000000 -0600 ++++ CVS2_6_14_PA0/sound/oss/ad1889.h 2005-03-01 16:00:56.000000000 -0700 @@ -1,57 +1,58 @@ #ifndef _AD1889_H_ #define _AD1889_H_ @@ -14272,9 +15527,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define AD_WAV_STATE 0 #define AD_ADC_STATE 1 -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/oss/harmony.c CVS2_6_14_RC2_PA6/sound/oss/harmony.c ---- LINUS_2_6_14_RC2/sound/oss/harmony.c 2005-09-22 19:18:35.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/oss/harmony.c 2005-09-13 11:30:53.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/oss/harmony.c CVS2_6_14_PA0/sound/oss/harmony.c +--- LINUS_2_6_14/sound/oss/harmony.c 2005-10-27 21:30:53.000000000 -0600 ++++ CVS2_6_14_PA0/sound/oss/harmony.c 2005-09-13 11:30:53.000000000 -0600 @@ -1236,7 +1236,7 @@ } @@ -14284,9 +15539,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd harmony.dev = dev; /* Grab the ID and revision from the device */ -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/parisc/harmony.c CVS2_6_14_RC2_PA6/sound/parisc/harmony.c ---- LINUS_2_6_14_RC2/sound/parisc/harmony.c 2005-09-22 19:18:36.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/parisc/harmony.c 2005-09-23 21:44:09.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/parisc/harmony.c CVS2_6_14_PA0/sound/parisc/harmony.c +--- LINUS_2_6_14/sound/parisc/harmony.c 2005-10-27 21:30:54.000000000 -0600 ++++ CVS2_6_14_PA0/sound/parisc/harmony.c 2005-09-23 21:44:09.000000000 -0600 @@ -197,7 +197,7 @@ spin_unlock(&h->lock); @@ -14496,9 +15751,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd err = -EBUSY; goto free_and_ret; } -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/parisc/harmony.h CVS2_6_14_RC2_PA6/sound/parisc/harmony.h ---- LINUS_2_6_14_RC2/sound/parisc/harmony.h 2005-09-22 19:18:36.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/parisc/harmony.h 2005-05-31 15:45:55.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/parisc/harmony.h CVS2_6_14_PA0/sound/parisc/harmony.h +--- LINUS_2_6_14/sound/parisc/harmony.h 2005-10-27 21:30:54.000000000 -0600 ++++ CVS2_6_14_PA0/sound/parisc/harmony.h 2005-05-31 15:45:55.000000000 -0600 @@ -61,7 +61,7 @@ #define HARMONY_SIZE 64 @@ -14546,9 +15801,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd #define HARMONY_GAIN_OUT 0x3f #define HARMONY_GAIN_LO_SHIFT 6 #define HARMONY_GAIN_LO_MASK (HARMONY_GAIN_OUT << HARMONY_GAIN_LO_SHIFT) -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/pci/Kconfig CVS2_6_14_RC2_PA6/sound/pci/Kconfig ---- LINUS_2_6_14_RC2/sound/pci/Kconfig 2005-09-22 19:18:36.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/pci/Kconfig 2005-09-29 21:29:18.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/pci/Kconfig CVS2_6_14_PA0/sound/pci/Kconfig +--- LINUS_2_6_14/sound/pci/Kconfig 2005-10-27 21:30:54.000000000 -0600 ++++ CVS2_6_14_PA0/sound/pci/Kconfig 2005-09-29 21:29:18.000000000 -0600 @@ -328,6 +328,14 @@ To compile this as a module, choose M here: the module will be called snd-ad1889. @@ -14564,9 +15819,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd config SND_ALS4000 tristate "Avance Logic ALS4000" depends on SND && ISA_DMA_API -diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14_RC2/sound/pci/ad1889.c CVS2_6_14_RC2_PA6/sound/pci/ad1889.c ---- LINUS_2_6_14_RC2/sound/pci/ad1889.c 2005-09-22 19:18:37.000000000 -0600 -+++ CVS2_6_14_RC2_PA6/sound/pci/ad1889.c 2005-08-31 21:28:22.000000000 -0600 +diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_14/sound/pci/ad1889.c CVS2_6_14_PA0/sound/pci/ad1889.c +--- LINUS_2_6_14/sound/pci/ad1889.c 2005-10-27 21:30:54.000000000 -0600 ++++ CVS2_6_14_PA0/sound/pci/ad1889.c 2005-08-31 21:28:22.000000000 -0600 @@ -45,16 +45,21 @@ #include #include