[kernel] r8289 - in dists/trunk/linux-2.6: . debian debian/arch
debian/arch/amd64 debian/arch/i386 debian/arch/i386/vserver
debian/arch/i386/xen debian/arch/i386/xen-vserver debian/templates
Bastian Blank
waldi at alioth.debian.org
Wed Feb 7 13:28:34 UTC 2007
Author: waldi
Date: Wed Feb 7 14:28:33 2007
New Revision: 8289
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/arch/amd64/config
dists/trunk/linux-2.6/debian/arch/config
dists/trunk/linux-2.6/debian/arch/i386/config
dists/trunk/linux-2.6/debian/arch/i386/defines
dists/trunk/linux-2.6/debian/arch/i386/vserver/defines
dists/trunk/linux-2.6/debian/arch/i386/xen-vserver/defines
dists/trunk/linux-2.6/debian/arch/i386/xen/defines
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in
Log:
Merge /dists/sid/linux-2.6.
Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config Wed Feb 7 14:28:33 2007
@@ -233,6 +233,7 @@
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_JMICRON=m
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_RZ1000=m
CONFIG_BLK_DEV_IDEDMA_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config (original)
+++ dists/trunk/linux-2.6/debian/arch/config Wed Feb 7 14:28:33 2007
@@ -116,6 +116,7 @@
CONFIG_DVB_USB_A800=m
CONFIG_TEXTSEARCH_KMP=m
CONFIG_BLK_DEV_IT821X=m
+# CONFIG_BLK_DEV_JMICRON is not set
CONFIG_TEXTSEARCH=y
CONFIG_DRM_VIA=m
CONFIG_USB_KEYSPAN_REMOTE=m
Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config Wed Feb 7 14:28:33 2007
@@ -292,6 +292,7 @@
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_JMICRON=m
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_RZ1000=m
CONFIG_BLK_DEV_IDEDMA_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines Wed Feb 7 14:28:33 2007
@@ -4,8 +4,9 @@
686
k7
686-bigmem
+ amd64
kernel-arch: i386
-kernel-header-dirs: i386
+kernel-header-dirs: i386 x86_64
subarches:
vserver
# xen
@@ -41,3 +42,13 @@
[k7_image]
recommends: libc6-i686
+[amd64]
+class: AMD64
+kernel-arch: x86_64
+longclass: all 64bit single- and multiprocessor AMD and Intel
+
+[amd64_image]
+configs: amd64/config amd64/config.amd64
+kpkg-arch: amd64
+recommends: libc6-i686
+
Modified: dists/trunk/linux-2.6/debian/arch/i386/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/vserver/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/vserver/defines Wed Feb 7 14:28:33 2007
@@ -2,6 +2,7 @@
flavours:
686
k7
+kernel-header-dirs: i386
[image]
configs: _vserver/config
Modified: dists/trunk/linux-2.6/debian/arch/i386/xen-vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen-vserver/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen-vserver/defines Wed Feb 7 14:28:33 2007
@@ -1,6 +1,7 @@
[base]
flavours:
686
+kernel-header-dirs: i386
[image]
configs:
Modified: dists/trunk/linux-2.6/debian/arch/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen/defines Wed Feb 7 14:28:33 2007
@@ -1,6 +1,7 @@
[base]
flavours:
686
+kernel-header-dirs: i386
[image]
configs:
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Feb 7 14:28:33 2007
@@ -31,6 +31,74 @@
-- maximilian attems <maks at sternwelten.at> Tue, 30 Jan 2007 09:32:00 +0100
+linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low
+
+ [ maximilian attems ]
+ * Add patches out of stable queue 2.6.18
+ - [amd64] Don't leak NT bit into next task (CVE-2006-5755)
+ - IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
+ - SCSI: add missing cdb clearing in scsi_execute()
+ * Xen postinst: Use takeover for update-initramfs. Makes postinst idempotent.
+ On creation it should always overwrite. (closes: #401183)
+ * Hand-picked from stable release 2.6.16.38:
+ - i2c-viapro: Add support for the VT8237A and VT8251
+ - PCI: irq: irq and pci_ids patch for Intel ICH9
+ - i2c-i801: SMBus patch for Intel ICH9
+ - fix the UML compilation
+ - drm: allow detection of new VIA chipsets
+ - drm: Add the P4VM800PRO PCI ID.
+ - rio: typo in bitwise AND expression.
+ - i2c-mv64xxx: Fix random oops at boot
+ - i2c: fix broken ds1337 initialization
+ - [SUNKBD]: Fix sunkbd_enable(sunkbd, 0); obvious.
+ - Call init_timer() for ISDN PPP CCP reset state timer (CVE-2006-5749)
+ - V4L: cx88: Fix leadtek_eeprom tagging
+ - SPI/MTD: mtd_dataflash oops prevention
+ - grow_buffers() infinite loop fix (CVE-2006-5757/CVE-2006-6060)
+ - corrupted cramfs filesystems cause kernel oops (CVE-2006-5823)
+ - ext2: skip pages past number of blocks in ext2_find_entry
+ (CVE-2006-6054)
+ - handle ext3 directory corruption better (CVE-2006-6053)
+ - hfs_fill_super returns success even if no root inode (CVE-2006-6056)
+ backout previous fix, was not complete.
+ - Fix for shmem_truncate_range() BUG_ON()
+ - ebtables: check struct type before computing gap
+ - [IPV4/IPV6]: Fix inet{,6} device initialization order.
+ - [IPV6] Fix joining all-node multicast group.
+ - [SOUND] Sparc CS4231: Use 64 for period_bytes_min
+ * [PKTGEN]: Convert to kthread API. Thanks David Miller for patch.
+ * [IDE] Add driver for Jmicron JMB36x devices by Alan Cox.
+ Enable jmicron on i386 and amd64 archs.
+ * Hand-picked from stable release 2.6.16.39:
+ - atiixp: hang fix
+ - V4L/DVB: Flexcop-usb: fix debug printk
+ - V4L/DVB: Fix uninitialised variable in dvb_frontend_swzigzag
+ - read_zero_pagealigned() locking fix
+ - adfs: fix filename handling
+ - sparc32: add offset in pci_map_sg()
+ - cdrom: set default timeout to 7 seconds
+ - [SCSI] qla1280 command timeout
+ - [SCSI] qla1280 bus reset typo
+ - [Bluetooth] Check if DLC is still attached to the TTY
+ - [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg()
+ - [Bluetooth] Return EINPROGRESS for non-blocking socket calls
+ - [Bluetooth] Handle command complete event for exit periodic inquiry
+ - [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP
+ - [Bluetooth] Add locking for bt_proto array manipulation
+ - i386: fix CPU hotplug with 2GB VMSPLIT
+
+ [ dann frazier ]
+ * Fix raid1 recovery (closes: #406181)
+
+ [ Jurij Smakov ]
+ * Add dtlb-prot-bug-niagara.patch by David Miller, fixing the bug in the
+ Niagara's DTLB-PROT trap.
+
+ [ Bastian Blank ]
+ * i386: Add amd64 image. (closes: #379090)
+
+ -- Bastian Blank <waldi at debian.org> Fri, 2 Feb 2007 12:50:35 +0100
+
linux-2.6 (2.6.18.dfsg.1-9) unstable; urgency=low
[ Martin Michlmayr ]
Modified: dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in (original)
+++ dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in Wed Feb 7 14:28:33 2007
@@ -7,7 +7,7 @@
if [ "$2" ]; then
update-initramfs -u -k @upstreamversion@@abiname@@localversion@
else
- update-initramfs -c -k @upstreamversion@@abiname@@localversion@
+ update-initramfs -c -t -k @upstreamversion@@abiname@@localversion@
command -v update-grub > /dev/null && update-grub
fi
;;
More information about the Kernel-svn-changes
mailing list