[kernel] r9156 - in dists/trunk/linux-2.6: . debian debian/bin

[Bastian Blank]

Author: waldi
Date: Tue Jul 17 09:51:33 2007
New Revision: 9156

Log:
Merge /dists/sid/linux-2.6.


Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/bin/check-patches.sh
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/bin/check-patches.sh
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/check-patches.sh	(original)
+++ dists/trunk/linux-2.6/debian/bin/check-patches.sh	Tue Jul 17 09:51:33 2007
@@ -2,8 +2,8 @@
 
 TMPDIR=$(mktemp -d)
 trap "rm -rf $TMPDIR" EXIT
-awk '{if (NF >= 2) print "debian/patches/" $2}' debian/patches/series/* | sort -u > $TMPDIR/used
-find debian/patches ! -path '*/series*' -type f -printf "%p\n" | sort > $TMPDIR/avail
+grep -v "^#"  debian/patches/series/* | awk '{if (NF >= 2) print "debian/patches/" $2}' | sort -u > $TMPDIR/used
+find debian/patches ! -path '*/series*' -type f -name "*.diff" -o -name "*.patch" -printf "%p\n" | sort > $TMPDIR/avail
 echo "Used patches"
 echo "=============="
 cat $TMPDIR/used

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jul 17 09:51:33 2007
@@ -4,7 +4,28 @@
 
  -- Bastian Blank <waldi at debian.org>  Tue, 17 Jul 2007 11:42:51 +0200
 
-linux-2.6 (2.6.22-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
+
+  [ Steve Langasek ]
+  * [alpha] request_irq-retval.patch: capture the return value of all
+    request_irq() calls in sys_titan.c to suppress the warning (and
+    build failure with -Werror); failures still aren't being handled, but
+    there's nothing that needs to be done -- or nothing that can be done
+    -- if these requests fail anyway.
+
+  [ Christian T. Steigies ]
+  * Add module.lds to kernel headers
+  * Enable INPUT_UINPUT on mac
+  * Add 2.6.22 patches from linux-m68k CVS
+
+  [ maximilian attems ]
+  * Add stable release 2.6.22.1:
+    - nf_conntrack_h323: add checking of out-of-range on choices' index values
+      (CVE-2007-3642)
+
+ -- maximilian attems <maks at debian.org>  Tue, 17 Jul 2007 11:26:40 +0200
+
+linux-2.6 (2.6.22-1) unstable; urgency=low
 
   [ Bastian Blank ]
   * Drop asfs options.
@@ -24,13 +45,10 @@
   * Enable INPUT_UINPUT on mac
   * Add 2.6.22 patches from linux-m68k CVS
 
-  [ Martin Michlmayr ]
-  * [mips] Add patch from Yoichi Yuasa to fix IDE on Cobalt.
-
   [ dann frazier ]
   * Enable vserver flavour for ia64 (closes: #423232)
 
- -- Christian T. Steigies <cts at debian.org>  Sun, 15 Jul 2007 14:58:22 +0200
+ -- Bastian Blank <waldi at debian.org>  Sun, 15 Jul 2007 15:03:40 +0200
 
 linux-2.6 (2.6.22~rc5-1~experimental.1) experimental; urgency=low