From 2bd9579fd965c0b8216575186c1100659787ba29 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Sat, 16 Jul 2005 07:35:52 +0000 Subject: [PATCH] list some dropped patches in changelog, and reasons for their dropping svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3543 --- debian/TODO.patches | 11 ----------- debian/changelog | 8 +++++--- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/debian/TODO.patches b/debian/TODO.patches index 66a1f683e..b95834783 100644 --- a/debian/TODO.patches +++ b/debian/TODO.patches @@ -92,15 +92,6 @@ modular-vesafb.patch Two hunks failed, manually corrected. net-bluetooth-signdness-fix.patch ACCEPTED. -patch-2.6.11.10.patch -patch-2.6.11.11.patch -patch-2.6.11.12.patch -patch-2.6.11.5.patch -patch-2.6.11.6.patch -patch-2.6.11.7.patch -patch-2.6.11.8.patch -patch-2.6.11.9.patch - All those are presumably backports, so not required. drivers-media-video-mt352-update.patch docbook-move-kernel-doc-comment-next-to-function.patch arch-ppc64-hugepage-aio-panic.patch @@ -119,8 +110,6 @@ powerpc-pmac-agp-sleep.patch ACCEPTED. powerpc-pmac-cache-power34-fix.patch NOT ACCEPTED | INCLUDED. -powerpc-ppc64-ibmvscsi.patch - NOT ACCEPTED | REDIFFED | INCLUDED. powerpc-prep-motorola-irq-fix.patch ACCEPTED. powerpc-serial.patch diff --git a/debian/changelog b/debian/changelog index 553a877e4..808914ee0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,11 @@ linux-2.6 (2.6.12-1) UNRELEASED; urgency=low - fixes + arch updates.. - readdition of tg3 driver, as firmware license has been fixed + * Dropped the following patches: + - patch-2.6.11.*.patch (merged upstream) + - powerpc-ppc64-ibmvscsi.patch (Christoph didn't like it, and it failed + to build anyways) (Sven Luther) + * Premiere of the common-source kernel package (Jurij Smakov, Andres Salomon) - build all architectures out of kernel source package @@ -60,9 +65,6 @@ linux-2.6 (2.6.12-1) UNRELEASED; urgency=low kernel version. kernel-package will be teached to make use of this, but it needs some cleanup and tidying yet. (Sven Luther) - * Removed the ibmvscsi patch, as Christoph doesn't like it, and it failed to - build anyway. (Sven Luther) - * Disabled software suspend on powerpc-smp, as the smp code in software suspend is amd64/i386 only. (Sven Luther)