[kernel] r14107 - in dists/trunk/linux-2.6: . debian debian/config/hppa debian/config/powerpc debian/patches/bugfix/powerpc debian/patches/features/all debian/patches/features/alpha debian/templates
Bastian Blank
waldi at alioth.debian.org
Fri Aug 14 21:56:27 UTC 2009
Author: waldi
Date: Fri Aug 14 21:56:25 2009
New Revision: 14107
Log:
Merge /dists/sid/linux-2.6.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/oldworld-boot-fix.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch
dists/trunk/linux-2.6/debian/patches/features/alpha/titan-video.patch
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/control.source.in
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Fri Aug 14 21:52:00 2009 (r14106)
+++ dists/trunk/linux-2.6/debian/changelog Fri Aug 14 21:56:25 2009 (r14107)
@@ -65,6 +65,75 @@
-- maximilian attems <maks at debian.org> Thu, 18 Jun 2009 23:50:56 +0200
+linux-2.6 (2.6.30-5) unstable; urgency=high
+
+ [ maximilian attems ]
+ * Add stable release 2.6.30.4.
+ - cifs: fix regression with O_EXCL creates and optimize away lookup
+ (closes: #536426)
+ - ecryptfs: check tag 11 literal data buffer size (CVE-2009-2406)
+ - ecryptfs: check tag 3 package encrypted size (CVE-2009-2407)
+ * Ignore nf_conntrack ABI change.
+ * Revert to keep ABI:
+ - block: fix sg SG_DXFER_TO_FROM_DEV regression.
+ - sched_rt: Fix overload bug on rt group scheduling.
+ * [hppa]: Ignore any ABI (broke on 2.6.30.2).
+
+ -- maximilian attems <maks at debian.org> Mon, 03 Aug 2009 12:08:56 +0200
+
+linux-2.6 (2.6.30-4) unstable; urgency=low
+
+ [ Bastian Blank ]
+ * Add stable release 2.6.30.2.
+ * Fix pci access in x86 startup code. (closes: #537783)
+ * Ignore ABI changes.
+ * Include all plattform and mach specific headers on arm.
+
+ [ maximilian attems ]
+ * Add stable release 2.6.30.3.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 30 Jul 2009 11:55:11 +0200
+
+linux-2.6 (2.6.30-3) unstable; urgency=low
+
+ [ Bastian Blank ]
+ * Build-Depend against cpio. (closes: #536196)
+
+ [ Martin Michlmayr ]
+ * [arm] Export __cpu_flush_dcache_page.
+
+ [ Aurelien Jarno ]
+ * [ia64] Fix asm/fpu.h includes.
+
+ [ dann frazier ]
+ * Fix NULL pointer dereference in tun_chr_pool() (CVE-2009-1897)
+ * personality: fix PER_CLEAR_ON_SETID (CVE-2009-1895)
+ * Add -fno-delete-null-pointer-checks to CFLAGS
+
+ -- Bastian Blank <waldi at debian.org> Sat, 18 Jul 2009 10:00:01 +0200
+
+linux-2.6 (2.6.30-2) unstable; urgency=low
+
+ [ dann frazier ]
+ * [powerpc] Use generic rtc (closes: #535354)
+ * [parisc]
+ - ensure broadcast tlb purge runs single threaded
+ - fix ldcw inline assembler
+ (closes: #535844)
+
+ [ Bastian Blank ]
+ * Add stable release 2.6.30.1:
+ - KVM: x86: check for cr3 validity in ioctl_set_sregs (CVE-2009-2287)
+ - ALSA: intel8x0 - Fix PCM position craziness (closes: #533780)
+ - ide-cd: prevent null pointer deref via cdrom_newpc_intr (closes: #535342)
+ * Ignore ABI changes.
+
+ [ maximilian attems ]
+ * [alpha] Add upstream smp buildfix.
+ * [parisc] Disable vxge and niu.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 07 Jul 2009 14:45:43 +0200
+
linux-2.6 (2.6.30-1) unstable; urgency=low
* New upstream release.
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config Fri Aug 14 21:52:00 2009 (r14106)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Aug 14 21:56:25 2009 (r14107)
@@ -294,6 +294,8 @@
CONFIG_PLIP=m
# CONFIG_NET_FC is not set
# CONFIG_NETPOLL_TRAP is not set
+# CONFIG_VXGE is not set
+# CONFIG_NIU is not set
##
## file: drivers/net/appletalk/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Fri Aug 14 21:52:00 2009 (r14106)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Aug 14 21:56:25 2009 (r14107)
@@ -658,6 +658,11 @@
CONFIG_TCIC=m
##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_GENERIC=y
+
+##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_DPT_I2O=m
@@ -1077,9 +1082,3 @@
## file: sound/usb/Kconfig
##
CONFIG_SND_USB_USX2Y=m
-
-##
-## file: unknown
-##
-CONFIG_RTC_DRV_PPC=y
-
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real Fri Aug 14 21:52:00 2009 (r14106)
+++ dists/trunk/linux-2.6/debian/rules.real Fri Aug 14 21:56:25 2009 (r14107)
@@ -203,7 +203,7 @@
echo Makefile; \
find arch/$(KERNEL_ARCH) -maxdepth 1 -name 'Makefile*' -print; \
find arch/$(KERNEL_ARCH) -name 'module.lds' -print; \
- find arch/$(KERNEL_ARCH)/include -print; \
+ find $$(find arch/$(KERNEL_ARCH) -name include -type d -print) -print; \
find include -name 'asm*' -prune -o -print; \
find include/asm-generic -print; \
) \
Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in Fri Aug 14 21:52:00 2009 (r14106)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in Fri Aug 14 21:56:25 2009 (r14107)
@@ -3,6 +3,6 @@
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>
Standards-Version: 3.8.2
-Build-Depends: debhelper (>> 7), module-init-tools, python
+Build-Depends: debhelper (>> 7), cpio, module-init-tools, python
Build-Depends-Indep: bzip2, python-central, xmlto
XS-Python-Version: current
More information about the Kernel-svn-changes
mailing list