debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=6783
This commit is contained in:
Bastian Blank 2006-06-06 22:06:18 +00:00
parent 11db77c656
commit 227637e674
8 changed files with 206 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
debian/arch/arm/config.footbridge vendored
View File

@ -196,7 +196,6 @@ CONFIG_IP_PNP_BOOTP=y
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
# CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
@ -408,7 +407,7 @@ CONFIG_PARIDE_ON26=m
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
@ -1121,12 +1120,178 @@ CONFIG_SOUND=m
#
# Advanced Linux Sound Architecture
#
# CONFIG_SND is not set
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_SEQUENCER=m
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
# CONFIG_SND_SEQUENCER_OSS is not set
CONFIG_SND_RTCTIMER=m
CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
#
# Generic devices
#
CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
#
# ISA devices
#
CONFIG_SND_CS4231_LIB=m
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_ALS100 is not set
# CONFIG_SND_AZT2320 is not set
# CONFIG_SND_CMI8330 is not set
# CONFIG_SND_CS4231 is not set
# CONFIG_SND_CS4232 is not set
# CONFIG_SND_CS4236 is not set
# CONFIG_SND_DT019X is not set
# CONFIG_SND_ES968 is not set
# CONFIG_SND_ES1688 is not set
# CONFIG_SND_ES18XX is not set
# CONFIG_SND_GUSCLASSIC is not set
# CONFIG_SND_GUSEXTREME is not set
# CONFIG_SND_GUSMAX is not set
# CONFIG_SND_INTERWAVE is not set
# CONFIG_SND_INTERWAVE_STB is not set
CONFIG_SND_OPL3SA2=m
# CONFIG_SND_OPTI92X_AD1848 is not set
# CONFIG_SND_OPTI92X_CS4231 is not set
# CONFIG_SND_OPTI93X is not set
# CONFIG_SND_SB8 is not set
# CONFIG_SND_SB16 is not set
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SSCAPE is not set
# CONFIG_SND_WAVEFRONT is not set
#
# PCI devices
#
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDA_INTEL is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
#
# ALSA ARM devices
#
#
# USB devices
#
# CONFIG_SND_USB_AUDIO is not set
#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
CONFIG_SOUND_PRIME=m
CONFIG_OBSOLETE_OSS_DRIVER=y
# CONFIG_SOUND_BT878 is not set
# CONFIG_SOUND_CMPCI is not set
# CONFIG_SOUND_EMU10K1 is not set
# CONFIG_SOUND_FUSION is not set
# CONFIG_SOUND_CS4281 is not set
# CONFIG_SOUND_ES1370 is not set
# CONFIG_SOUND_ES1371 is not set
# CONFIG_SOUND_ESSSOLO1 is not set
# CONFIG_SOUND_MAESTRO is not set
# CONFIG_SOUND_MAESTRO3 is not set
# CONFIG_SOUND_ICH is not set
# CONFIG_SOUND_SONICVIBES is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
# CONFIG_SOUND_VIA82CXXX is not set
CONFIG_SOUND_OSS=m
# CONFIG_SOUND_TRACEINIT is not set
# CONFIG_SOUND_DMAP is not set
# CONFIG_SOUND_AD1816 is not set
# CONFIG_SOUND_AD1889 is not set
# CONFIG_SOUND_SGALAXY is not set
# CONFIG_SOUND_ADLIB is not set
# CONFIG_SOUND_ACI_MIXER is not set
# CONFIG_SOUND_CS4232 is not set
# CONFIG_SOUND_SSCAPE is not set
# CONFIG_SOUND_GUS is not set
# CONFIG_SOUND_VMIDI is not set
# CONFIG_SOUND_TRIX is not set
# CONFIG_SOUND_MSS is not set
# CONFIG_SOUND_MPU401 is not set
# CONFIG_SOUND_NM256 is not set
# CONFIG_SOUND_MAD16 is not set
# CONFIG_SOUND_PAS is not set
# CONFIG_SOUND_PSS is not set
# CONFIG_SOUND_SB is not set
# CONFIG_SOUND_AWE32_SYNTH is not set
# CONFIG_SOUND_WAVEFRONT is not set
# CONFIG_SOUND_MAUI is not set
CONFIG_SOUND_YM3812=m
# CONFIG_SOUND_OPL3SA1 is not set
# CONFIG_SOUND_OPL3SA2 is not set
# CONFIG_SOUND_YMFPCI is not set
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
CONFIG_SOUND_WAVEARTIST=m
# CONFIG_SOUND_TVMIXER is not set
# CONFIG_SOUND_ALI5455 is not set
# CONFIG_SOUND_FORTE is not set
# CONFIG_SOUND_RME96XX is not set
# CONFIG_SOUND_AD1980 is not set
#
# USB support
@ -1746,3 +1911,5 @@ CONFIG_JFFS_FS_VERBOSE=0
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_FS=m
CONFIG_JFFS_FS=m
# CONFIG_VIDEO_SAA7134_ALSA is not set
# CONFIG_VIDEO_SAA7134_OSS is not set

6
debian/arch/arm/config.ixp4xx vendored
View File

@ -429,9 +429,9 @@ CONFIG_MTD_NAND_IDS=m
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16

8
debian/arch/arm/config.nslu2 vendored
View File

@ -676,9 +676,9 @@ CONFIG_MTD_NAND_IDS=m
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
@ -1520,7 +1520,7 @@ CONFIG_HID_FF=y
CONFIG_HID_PID=y
CONFIG_LOGITECH_FF=y
# CONFIG_THRUSTMASTER_FF is not set
# CONFIG_USB_HIDDEV is not set
CONFIG_USB_HIDDEV=y
#
# USB HID Boot Protocol drivers

5
debian/arch/arm/config.rpc vendored
View File

@ -177,7 +177,6 @@ CONFIG_BINFMT_AOUT=y
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
# CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
@ -266,8 +265,8 @@ CONFIG_BLK_DEV_FD=y
# CONFIG_PARIDE is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096

5
debian/arch/arm/config.s3c2410 vendored
View File

@ -208,7 +208,6 @@ CONFIG_IP_PNP_BOOTP=y
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
# CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
@ -378,8 +377,8 @@ CONFIG_PARPORT_1284=y
#
# CONFIG_PARIDE is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16

2
debian/arch/armeb/config.nslu2 vendored
View File

@ -469,7 +469,7 @@ CONFIG_MTD_NAND_IDS=m
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set

4
debian/arch/mipsel/defines vendored
View File

@ -3,8 +3,8 @@ flavours:
r5k-cobalt
sb1-bcm91250a
sb1a-bcm91480b
# r3k-kn02
# r4k-kn04
r3k-kn02
r4k-kn04
kernel-arch: mips
kernel-header-dirs: mips
initrd: no

25
debian/changelog vendored
View File

@ -33,9 +33,24 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
[ maximilian attems ]
* Add stable release 2.6.16.18:
- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
* Add stable release 2.6.16.19:
- NETFILTER: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)
* Add stable release 2.6.16.20:
- x86_64: Don't do syscall exit tracing twice
- Altix: correct ioc4 port order
- Input: psmouse - fix new device detection logic
- PowerMac: force only suspend-to-disk to be valid
- the latest consensus libata resume fix
- Altix: correct ioc3 port order
- Cpuset: might sleep checking zones allowed fix
- ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices
- sbp2: backport read_capacity workaround for iPod
- sbp2: fix check of return value of hpsb_allocate_and_register_addrspace
- x86_64: x86_64 add crashdump trigger points
- ipw2200: Filter unsupported channels out in ad-hoc mode
[ Christian T. Steigies ]
* [m68k] Add mac via patch.
* [m68k] Add mac via patch from Finn Thain.
* [m68k] Enable INPUT_EVDEV.
[ Martin Michlmayr ]
@ -44,10 +59,12 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
* [mipsel] Add a patch that let's you enable serial console on DECstation.
* [mipsel] Add a patch to get SCSI working on DECstation.
* [mipsel] Handle memory-mapped RTC chips properly.
* [mipsel] Add configs for r3k-kn02 and r4k-kn04 DECstation but don't
activate them yet.
* [mipsel] Add configs for r3k-kn02 and r4k-kn04 DECstation.
* [arm] Allow RiscPC machines to boot an initrd (tagged list fix).
* [arm/nslu2] Enable many modules.
* [arm] Build loop support as a module.
* [arm] Use the generic netfilter configuration.
* [arm/footbridge] Enable sound.
[ Kyle McMartin ]
* [hppa] Pulled patch from cvs to fix build of kernel/ptrace.c which needs
@ -62,7 +79,7 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
[ Bastian Blank ]
* Update vserver patch to 2.0.2-rc21.
-- Bastian Blank <waldi@debian.org> Fri, 26 May 2006 14:59:27 +0200
-- maximilian attems <maks@sternwelten.at> Mon, 5 Jun 2006 20:22:12 +0200
linux-2.6 (2.6.16-14) unstable; urgency=low