From 740cca25a86e94af27f727ed5a6c66a97a28c39c Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 21 Mar 2006 22:48:04 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6257 --- debian/README.build | 2 +- debian/arch/arm/config.nslu2 | 3 ++- debian/arch/armeb/config.nslu2 | 3 ++- debian/arch/hppa/config | 2 ++ debian/arch/ia64/config | 13 ++++++++++- debian/arch/mipsel/config.r5k-cobalt | 28 ++++++++++++++++++++++-- debian/arch/mipsel/config.sb1-bcm91250a | 11 +++++----- debian/arch/mipsel/config.sb1a-bcm91480b | 11 +++++----- debian/changelog | 19 +++++++++++++--- 9 files changed, 73 insertions(+), 19 deletions(-) diff --git a/debian/README.build b/debian/README.build index 968520ed6..df088537e 100644 --- a/debian/README.build +++ b/debian/README.build @@ -2,7 +2,7 @@ Building kernels from SVN (for official images): 1) Start by downloading a kernel tarball from kernel.org (ie, linux-2.6.12.tar.bz2). -2) Run trunk/scripts/prune-non-free . This will produce two +2) Run trunk/scripts/prune-non-free . This will produce two additional tarballs; linux-kernel-.orig.tar.gz and linux-kernel-nonfree-.orig.tar.gz. Ignore the nonfree tarball for now. diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index 747f9e5f2..e84f0b234 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -1377,7 +1377,8 @@ CONFIG_LOCKD_V4=y CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index 747f9e5f2..e84f0b234 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -1377,7 +1377,8 @@ CONFIG_LOCKD_V4=y CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index b602c8df3..9997c6ab7 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -502,6 +502,7 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y @@ -801,6 +802,7 @@ CONFIG_ZLIB_DEFLATE=m CONFIG_SND_HWDEP=m CONFIG_NFS_ACL_SUPPORT=y # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_F71805F is not set # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index c50260186..71fdc9921 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -171,7 +171,9 @@ CONFIG_PARPORT_PC_PCMCIA=m CONFIG_PARPORT_NOT_PC=y # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_1284=y -# CONFIG_PNP is not set +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set +CONFIG_PNPACPI=y CONFIG_PARIDE=m CONFIG_PARIDE_PARPORT=m CONFIG_PARIDE_PD=m @@ -211,6 +213,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m CONFIG_IDE=m +CONFIG_IDE_MAX_HWIFS=4 CONFIG_BLK_DEV_IDE=m # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_BLK_DEV_IDEDISK=m @@ -451,6 +454,7 @@ CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m CONFIG_DUMMY=m +CONFIG_NET_SB1000=m CONFIG_ARCNET=m CONFIG_ARCNET_1201=m CONFIG_ARCNET_1051=m @@ -657,8 +661,10 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y +CONFIG_COMPUTONE=m CONFIG_ROCKETPORT=m # CONFIG_CYCLADES is not set +CONFIG_MOXA_INTELLIO=m # CONFIG_MOXA_SMARTIO is not set # CONFIG_ISI is not set CONFIG_SYNCLINKMP=m @@ -675,6 +681,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_ACPI=y CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set @@ -684,6 +691,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SGI_IOC3=m CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_PRINTER=m @@ -754,6 +762,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_GL518SM=m @@ -1113,6 +1122,7 @@ CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRPRIME=m CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m @@ -1158,6 +1168,7 @@ CONFIG_INFINIBAND_MTHCA=m # CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_SGI_IOC3=m CONFIG_JBD=m CONFIG_FS_MBCACHE=m CONFIG_TMPFS_XATTR=y diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index f48cefdb9..0524de7e0 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -479,7 +479,13 @@ CONFIG_FW_LOADER=m # # Parallel port support # -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_1284=y # # Plug and Play support @@ -488,6 +494,7 @@ CONFIG_FW_LOADER=m # # Block devices # +# 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 @@ -645,6 +652,8 @@ CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 @@ -775,6 +784,7 @@ CONFIG_SUNDANCE=m CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_LAN_SAA9730 is not set +# CONFIG_NET_POCKET is not set # # Ethernet (1000 Mbit) @@ -848,6 +858,7 @@ CONFIG_NET_WIRELESS=y # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set +CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y @@ -921,6 +932,7 @@ CONFIG_INPUT_UINPUT=m CONFIG_SERIO=m CONFIG_SERIO_I8042=m CONFIG_SERIO_SERPORT=m +# CONFIG_SERIO_PARKBD is not set # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=m # CONFIG_SERIO_RAW is not set @@ -949,6 +961,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_TIPAR is not set # # IPMI @@ -992,6 +1007,7 @@ CONFIG_SPI_MASTER=y # SPI Master Controller Drivers # CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set # # SPI Protocol Masters @@ -1029,6 +1045,9 @@ CONFIG_VIDEO_DEV=m # Video Adapters # # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +# CONFIG_VIDEO_W9966 is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_STRADIS is not set # CONFIG_VIDEO_MXB is not set @@ -1284,6 +1303,7 @@ CONFIG_USB_MON=y # # USB port drivers # +# CONFIG_USB_USS720 is not set # # USB Serial Converter support @@ -1383,7 +1403,11 @@ CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS_XATTR=y # CONFIG_REISERFS_FS_POSIX_ACL is not set # CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_JFS_FS is not set +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m CONFIG_XFS_EXPORT=y diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 92e4fe17a..07837fa9d 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -737,12 +737,12 @@ CONFIG_SCSI_DEBUG=m # Multi-device support (RAID and LVM) # CONFIG_MD=y -CONFIG_BLK_DEV_MD=y +CONFIG_BLK_DEV_MD=m CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m -CONFIG_MD_RAID5=y +CONFIG_MD_RAID5=m CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m @@ -751,7 +751,8 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m -# CONFIG_DM_MULTIPATH is not set +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_EMC is not set # # Fusion MPT device support diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index 8b23d4723..3a07413e0 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -738,12 +738,12 @@ CONFIG_SCSI_DEBUG=m # Multi-device support (RAID and LVM) # CONFIG_MD=y -CONFIG_BLK_DEV_MD=y +CONFIG_BLK_DEV_MD=m CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m -CONFIG_MD_RAID5=y +CONFIG_MD_RAID5=m CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m @@ -752,7 +752,8 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m -# CONFIG_DM_MULTIPATH is not set +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_EMC is not set # # Fusion MPT device support diff --git a/debian/changelog b/debian/changelog index 934522c29..ae114d56a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,15 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low -- Bastian Blank Mon, 20 Mar 2006 12:33:49 +0100 -linux-2.6 (2.6.16-1) UNRELEASED; urgency=low +linux-2.6 (2.6.16-2) UNRELEASED; urgency=low + + * [ia64] Set unconfigured options: + CONFIG_PNP_DEBUG=n and CONFIG_NET_SB1000=m + * [hppa] Update config for 2.6.16 + + -- dann frazier Tue, 21 Mar 2006 15:31:07 -0700 + +linux-2.6 (2.6.16-1) unstable; urgency=low [ Bastian Blank ] * New upstream release. @@ -26,11 +34,16 @@ linux-2.6 (2.6.16-1) UNRELEASED; urgency=low * [mips] Fix VINO drivers when using a 64-bit kernel (Mikael Nousiainen). * [arm/armeb] Update configs for 2.6.16. * [mips/mipsel] Update configs for 2.6.16. + * [arm/armeb] Enable the SMB module on NSLU2. + * [mipsel] Enable parallel port modules for Cobalt since there are PCI + cards that can be used in a Qube. + * [mipsel] Enable the JFS module on Cobalt. [ dann frazier ] - * [ia64] use yaird on ia64 until #341181 is fixed + * [ia64] use yaird on ia64 until #357414 is fixed + * [ia64] Update configs for 2.6.16 - -- Bastian Blank Thu, 16 Mar 2006 19:24:30 +0100 + -- Bastian Blank Tue, 21 Mar 2006 16:12:16 +0100 linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low