[kernel] r5209 - in people/waldi/linux-2.6: . debian debian/arch debian/patches-debian/series debian/templates

Bastian Blank waldi at costa.debian.org
Tue Jan 3 16:21:54 UTC 2006


Author: waldi
Date: Tue Jan  3 16:21:53 2006
New Revision: 5209

Added:
   people/waldi/linux-2.6/debian/patches-debian/series/2.6.15-1
Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/defines
   people/waldi/linux-2.6/debian/changelog
   people/waldi/linux-2.6/debian/templates/control.image.in
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/defines	Tue Jan  3 16:21:53 2006
@@ -1,5 +1,5 @@
 [base]
-abiname: 2
+abiname: 1
 arches:
  alpha
  amd64

Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog	(original)
+++ people/waldi/linux-2.6/debian/changelog	Tue Jan  3 16:21:53 2006
@@ -1,34 +1,37 @@
-linux-2.6 (2.6.14+2.6.15-rc7-0experimental.3) UNRELEASED; urgency=low
+linux-2.6 (2.6.15-2) unstable; urgency=low
 
-  [ Bastian Blank ]
-  * [s390] Update configs.
-
- -- Bastian Blank <waldi at debian.org>  Mon, 02 Jan 2006 11:23:55 +0100
-
-linux-2.6 (2.6.14+2.6.15-rc7-0experimental.2) experimental; urgency=low
+  [ maximilian attems ]
+  * Default to initramfs-tools as initramfs generator.
 
-  [ Kyle McMartin ]
-  * Snag latest hppa.diff from cvs.parisc-linux.org.
-  * Update configs for 2.6.15.
+ -- maximilian attems <maks at sternwelten.at>  Tue,  3 Jan 2006 16:28:30 +0100
 
-  [ Frederik Schüler ]
-  * Fix kconfig.ml call in rules.real.
+linux-2.6 (2.6.15-1) unstable; urgency=low
 
   [ Sven Luther ]
+  * New upstream release.
+  * [powerpc] Now use ARCH=powerpc for 64bit powerpc flavours, 32bit still
+    stays with ARCH=ppc for now.
   * [powerpc] Readded PReP Motorola PowerStack II Utah IDE interrupt
     (Closes: #345424)
-  * [powerpc] Readded Marvell gigabit ethernet hotplug support which is not
-    yet upstream after all, only went to -mm.
-
- -- Sven Luther <luther at debian.org>  Sun,  1 Jan 2006 16:14:02 +0000
+  * [powerpc] Fixed apus patch.
+  * Added make-kpkg --arch option support to gencontrol.py.
+  * Added debian/bin/kconfig.ml to process config file snipplet, so we can
+    preserve the pre 2.6.15 ordering of config file snipplets. Upto 2.6.15
+    the kernel Kconfig magic apparently kept the later occuring config options,
+    but it seems that this is no more the case. Instead of catting the config
+    files together, not use the kconfig.ml script to read in the files from
+    more generic to more specific, and keep only the more specific.
 
-linux-2.6 (2.6.14+2.6.15-rc7-0experimental.1) experimental; urgency=low
+  [ Bastian Blank ]
+  * [s390] Update configs.
 
   [ Kyle McMartin ]
-  * Change parisc kernel names to something less ambiguous.
+  * [hppa] Snag latest hppa.diff from cvs.parisc-linux.org.
+  * [hppa] Update configs for 2.6.15.
+  * [hppa] Change parisc kernel names to something less ambiguous.
 
   [ dann frazier ]
-  * Update ia64 configs
+  * [ia64] Update ia64 configs
 
   [ maximilian attems ]
   * Drop modular-ide.patch, nacked by ide upstream.  Prevents udev to load
@@ -45,25 +48,24 @@
   * Clean duplicate Kconfig options.
 
   [ Frederik Schüler ]
-  * New upstream release cadidate.
   * Add updated version of drivers-scsi-megaraid_splitup.patch.
   * Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
     option.
   * Make CONFIG_VIDEO_SAA7134 a global option.
   * New option CONFIG_CC_OPTIMIZE_FOR_SIZE set per-arch.
-
-  [ Sven Luther ]
-  * Added make-kpkg --arch option support to gencontrol.py.
-  * [powerpc] now set --arch kernel-package option correctly.
-  * [powerpc] Fixed apus patch for 2.6.15-rc7 (and beyond hopefully).
-  * [powerpc] Fixed config options, but i guess jonas broke it again with his
-    cleanup, oh well :)
-  * Added debian/bin/kconfig.ml to process config file snipplet, so we can
-    preserve the pre 2.6.15 ordering of config file snipplets. Upto 2.6.15
-    the kernel Kconfig magic apparently kept the later occuring config options,
-    but it seems that this is no more the case. Instead of catting the config
-    files together, not use the kconfig.ml script to read in the files from
-    more generic to more specific, and keep only the more specific.
+  * Rename i386 368 flavour to 486.
+  * Add myself to uploaders.
+  * Readdition of qla2xxx drivers, as firmware license has been fixed.
+  * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
+    statically linked has better performance then modules due to TLB issue.
+  * clean up debian-patches dir: remove all obsolete patches:
+    - alpha-compile-fix.patch: obsolete
+    - amd64-int3-fix.patch: fixed since 2.6.12
+    - net-ipconntrack-nat-fix.patch: merged upstream after 2.6.14 release
+    - net-nf_queue-oops.patch: merged upstream after 2.6.14 release
+    - qla2xxx-removed.patch: obsolete
+  * Drop M386 support remains from the i386 386 flavour: built with M486 
+    from now on.
 
   [ Martin Michlmayr ]
   * [arm] Don't define "compiler" since GCC 4.x is the default now anyway.
@@ -80,35 +82,107 @@
     sparc64-atyfb-xl-gr-final.patch to avoid the confusion.
     Thanks to Luis F. Ortiz for fixing the patch and Luigi Gangitano
     for testing it out.
+  * Drop tty-locking-fixes9.patch, which was preventing the oops during
+    shutdown on some sparc machines with serial console. Proper fix has
+    been incorporated upstream.
   
- -- Sven Luther <luther at debian.org>  Thu, 29 Dec 2005 09:48:36 +0000
+  [ Simon Horman ]
+  * Enable MKISS globally (closes: #340215)
+  * Add recommends libc6-i686 to 686 and k7 image packages
+    (closes: #278729)
+  * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
+    as alsa snd-usb-audio still isn't quite there.
+    I expect this to be re-disabled at some stage,
+    possibly soon if it proves to be a source of bugs.
+    (closes: #340388)
 
-linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
+ -- Sven Luther <luther at debian.org>  Tue,  3 Jan 2006 06:48:07 +0000
 
-  * New upstream release candidate.
-  * Rename i386 368 flavour to 486.
-  * Add myself to uploaders.
+linux-2.6 (2.6.14-7) unstable; urgency=low
+
+  [ maximilian attems ]
+  * Add stable tree 2.6.14.5 fixes:
+    - setting ACLs on readonly mounted NFS filesystems (CVE-2005-3623)
+    - Fix bridge-nf ipv6 length check
+    - Perform SA switchover immediately.
+    - Input: fix an OOPS in HID driver
+    - Fix hardware checksum modification
+    - kernel/params.c: fix sysfs access with CONFIG_MODULES=n
+    - Fix RTNLGRP definitions in rtnetlink.h
+    - Fix CTA_PROTO_NUM attribute size in ctnetlink
+    - Fix unbalanced read_unlock_bh in ctnetlink
+    - Fix NAT init order
+    - Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE
+    - dpt_i2o fix for deadlock condition
+    - SCSI: fix transfer direction in sd (kernel panic when ejecting iPod)
+    - SCSI: fix transfer direction in scsi_lib and st
+    - Fix hardware rx csum errors
+    - Fix route lifetime.
+    - apci: fix NULL deref in video/lcd/brightness 
 
- -- Frederik Schüler <fs at debian.org>  Fri,  9 Dec 2005 16:30:06 +0000
+ -- maximilian attems <maks at sternwelten.at>  Tue, 27 Dec 2005 17:39:16 +0100
 
-linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) experimental; urgency=low
+linux-2.6 (2.6.14-6) unstable; urgency=low
+
+  [ Kyle McMartin ]
+  * Change parisc kernel names to something less ambiguous.
+
+  [ maximilian attems ]
+  * Drop modular-ide.patch, nacked by ide upstream.  Prevents udev to load
+    ide-generic and those successfull boots with initramfs-tools.
+  * Add stable tree 2.6.14.4 with the following fixes:
+    - drivers/scsi/dpt_i2o.c: fix a user-after-free
+    - drivers/message/i2o/pci.c: fix a use-after-free
+    - drivers/infiniband/core/mad.c: fix a use-after-free
+    - DVB: BUDGET CI card depends on STV0297 demodulator
+    - setkeys needs root
+    - Fix listxattr() for generic security attributes
+    - AGPGART: Fix serverworks TLB flush.
+    - Fix crash when ptrace poking hugepage areas
+    - I8K: fix /proc reporting of blank service tags
+    - i82365: release all resources if no devices are found
+    - bonding: fix feature consolidation
+    - libata: locking rewrite (== fix)
+    - cciss: bug fix for BIG_PASS_THRU
+    - ALSA: nm256: reset workaround for Latitude CSx
+    - cciss: bug fix for hpacucli
+    - V4L/DVB: Fix analog NTSC for Thomson DTT 761X hybrid tuner
+    - BRIDGE: recompute features when adding a new device
+    - 32bit integer overflow in invalidate_inode_pages2()
+    - USB: Adapt microtek driver to new scsi features
+    - ide-floppy: software eject not working with LS-120 drive
+    - Add try_to_freeze to kauditd
+    - V4L/DVB (3135) Fix tuner init for Pinnacle PCTV Stereo
+    - NETLINK: Fix processing of fib_lookup netlink messages
+    - ACPI: fix HP nx8220 boot hang regression
+
+  [ Norbert Tretkowski ]
+  * [alpha] Removed conflict with initramfs-tools, thanks vorlon for finding
+    the klibc bug!
 
   [ Frederik Schüler ]
-  * New upstream release candidate.
-  * Readdition of qla2xxx drivers, as firmware license has been fixed.
-  * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
-    statically linked has better performance then modules due to TLB issue.
-  * clean up debian-patches dir: remove all obsolete patches:
-    - alpha-compile-fix.patch: obsolete
-    - amd64-int3-fix.patch: fixed since 2.6.12
-    - net-ipconntrack-nat-fix.patch: merged upstream after 2.6.14 release
-    - net-nf_queue-oops.patch: merged upstream after 2.6.14 release
-    - qla2xxx-removed.patch: obsolete
-  * Drop M386 support remains from the i386 386 flavour: built with M486 
-    from now on.
+  * Add updated drivers-scsi-megaraid_splitup.patch. (Closes: #317258)
+  * Add ppc64-thermal-overtemp.patch to fix a thermal control bug in G5
+    machines. (Closes: #343980)
+  * Unpatch the following patches which are included in 2.6.14.4:
+    - setkeys-needs-root-1.patch
+    - setkeys-needs-root-2.patch
+    - mm-invalidate_inode_pages2-overflow.patch
+    - net-bonding-consolidation-fix.patch
+
+ -- Frederik Schüler <fs at debian.org>  Tue, 20 Dec 2005 18:50:41 +0000
+
+linux-2.6 (2.6.14-5) unstable; urgency=low
+
+  [ dann frazier ]
+  * ia64-new-assembler-fix.patch
+    Fix ia64 builds with newer assembler (Closes: #341257)
+
+  [ Sven Luther ]
+  * [powerpc] incremented ramdisk size to 24576 from 8192, needed by the
+    graphical installer, maybe we can bring this to 16384 later.
 
   [ Simon Horman ]
-  * Enable MKISS globally (closes: #340215)
   * Add recommends libc6-i686 to 686 and k7 image packages
     (closes: #278729)
   * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
@@ -117,15 +191,69 @@
     possibly soon if it proves to be a source of bugs.
     (closes: #340388)
 
+  [ dann frazier ]
+  * buslogic-pci-id-table.patch
+    add a pci device id table to fix initramfs-tools discovery.
+    (closes #342057)
+  * fix feature consolidation in bonding driver.  (closes #340068)
+
+ -- dann frazier <dannf at debian.org>  Thu,  8 Dec 2005 10:59:31 -0700
+
+linux-2.6 (2.6.14-4) unstable; urgency=low
+
+  [ dann frazier ]
+  * setkeys-needs-root-1.patch, setkeys-needs-root-2.patch:
+    [SECURITY] Require root privilege to write the current
+    function key string entry of other user's terminals.
+    See CVE-2005-3257 (Closes: #334113)
+
+  [ Simon Horman ]
+  * Enable MKISS globally (closes: #340215)
+  * mm-invalidate_inode_pages2-overflow.patch
+    [SECURITY] 32bit integer overflow in invalidate_inode_pages2() (local DoS)
+  * ctnetlink-check-if-protoinfo-is-present.patch
+    [SECURITY] ctnetlink: check if protoinfo is present (local DoS)
+  * ctnetlink-fix-oops-when-no-icmp-id-info-in-message.patch
+    [SECURITY] ctnetlink: Fix oops when no ICMP ID info in message (local DoS)
+
   [ Sven Luther ]
-  * [powerpc] Now use ARCH=powerpc for both 32bit and 64bit powerpc flavours.
+  * Re-added powerpc/apus patch, now that Roman Zippel merged it in.
+  * Let's create asm-(ppc|ppc64) -> asm-powerpc symlink farm.  (Closes: #340571)
 
-  [ Jurij Smakov ]
-  * Drop tty-locking-fixes9.patch, which was preventing the oops during
-    shutdown on some sparc machines with serial console. Proper fix has
-    been incorporated upstream.
+  [ maximilian attems ]
+  * Add 2.6.14.3 patch - features changelog:
+    - isdn/hardware/eicon/os_4bri.c: correct the xdiLoadFile() signature
+    - x86_64/i386: Compute correct MTRR mask on early Noconas
+    - PPTP helper: Fix endianness bug in GRE key / CallID NAT
+    - nf_queue: Fix Ooops when no queue handler registered
+    - ctnetlink: check if protoinfo is present
+    - ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768
+    - VFS: Fix memory leak with file leases
+    - hwmon: Fix lm78 VID conversion
+    - hwmon: Fix missing it87 fan div init
+    - ppc64 memory model depends on NUMA
+    - Generic HDLC WAN drivers - disable netif_carrier_off()
+    - ctnetlink: Fix oops when no ICMP ID info in message
+    - Don't auto-reap traced children
+    - packet writing oops fix
+    - PPTP helper: fix PNS-PAC expectation call id
+    - NAT: Fix module refcount dropping too far
+    - Fix soft lockup with ALSA rtc-timer
+    - Fix calculation of AH length during filling ancillary data.
+    - ip_conntrack TCP: Accept SYN+PUSH like SYN
+    - refcount leak of proto when ctnetlink dumping tuple
+    - Fix memory management error during setting up new advapi sockopts.
+    - Fix sending extension headers before and including routing header.
+    - hwmon: Fix missing boundary check when setting W83627THF in0 limits
+  * Remove ctnetlink-check-if-protoinfo-is-present.patch,
+    net-nf_queue-oops.patch - already included in 2.6.14.3.
+
+  [ Frederik Schüler ]
+  * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
+    statically linked has better performance then modules due to TLB issue.
+  * Add myself to uploaders.
 
- -- Frederik Schüler <fs at debian.org>  Sun,  4 Dec 2005 12:31:04 +0000
+ -- Frederik Schüler <fs at debian.org>  Sat, 26 Nov 2005 13:18:41 +0100
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

Added: people/waldi/linux-2.6/debian/patches-debian/series/2.6.15-1
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches-debian/series/2.6.15-1	Tue Jan  3 16:21:53 2006
@@ -0,0 +1,24 @@
++ fbdev-radeon-noaccel.patch
++ fs-asfs-2.patch
++ ia64-irq-affinity-upfix.patch
++ modular-ide-pnp.patch
++ powerpc-mkvmlinuz-support.patch
++ powerpc-serial.patch
+#+ remove-references-to-removed-drivers.patch
++ sparc64-hme-lockup.patch
+#+ tty-locking-fixes9.patch
++ version.patch
++ powerpc-apus.patch
+#+ s390-uaccess-const.patch
++ powerpc-build-links.patch
++ m68k-bvme.patch
++ m68k-mvme147.patch
++ m68k-mvme16x.patch
++ m68k-spinlock.patch
++ sparc64-atyfb-xl-gr-final.patch
++ powerpc-arch-default-powerpc.patch
++ drivers-scsi-megaraid_splitup.patch
++ powerpc-mv643xx-spinlock-fix-support.patch
++ powerpc-prep-utah-ide-interrupt.patch
++ powerpc-mv643xx-hotplug-support.patch
+

Modified: people/waldi/linux-2.6/debian/templates/control.image.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.in	(original)
+++ people/waldi/linux-2.6/debian/templates/control.image.in	Tue Jan  3 16:21:53 2006
@@ -2,7 +2,7 @@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@
-Depends: yaird | initramfs-tools | linux-initramfs-tool, module-init-tools (>= 0.9.13)
+Depends: initramfs-tools | yaird | linux-initramfs-tool, module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: linux-doc- at version@ | linux-source- at version@
 Description: Linux kernel @version@ image on @class@ machines



More information about the Kernel-svn-changes mailing list