Merge /dists/sid/linux-2.6.

svn path=/dists/trunk/linux-2.6/; revision=9156
This commit is contained in:
Bastian Blank 2007-07-17 09:51:33 +00:00
parent 6d58ddb9bd
commit 869466803d
2 changed files with 25 additions and 7 deletions

View File

@ -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

28
debian/changelog vendored
View File

@ -4,7 +4,28 @@ linux-2.6 (2.6.22-trunk.1) UNRELEASED; urgency=low
-- Bastian Blank <waldi@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@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 @@ linux-2.6 (2.6.22-1~experimental.1) UNRELEASED; urgency=low
* 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@debian.org> Sun, 15 Jul 2007 14:58:22 +0200
-- Bastian Blank <waldi@debian.org> Sun, 15 Jul 2007 15:03:40 +0200
linux-2.6 (2.6.22~rc5-1~experimental.1) experimental; urgency=low