From d69f1b881250f7c6d56840b1d3f87e953c7d77ac Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 19 Nov 2006 13:09:14 +0000 Subject: [PATCH] debian/patches/series - Remove old files. - Add only debian specific and known non-backport features back. svn path=/dists/trunk/linux-2.6/; revision=7825 --- debian/patches/series/1 | 35 ------------- debian/patches/series/1-extra | 5 -- debian/patches/series/1~experimental.1 | 9 ++++ .../{5-extra => 1~experimental.1-extra} | 1 + debian/patches/series/2 | 5 -- debian/patches/series/2-extra | 6 --- debian/patches/series/3 | 30 ------------ debian/patches/series/3-extra | 1 - debian/patches/series/4 | 49 ------------------- debian/patches/series/4-extra | 4 -- debian/patches/series/5 | 7 --- debian/patches/series/6 | 24 --------- 12 files changed, 10 insertions(+), 166 deletions(-) delete mode 100644 debian/patches/series/1 delete mode 100644 debian/patches/series/1-extra create mode 100644 debian/patches/series/1~experimental.1 rename debian/patches/series/{5-extra => 1~experimental.1-extra} (84%) delete mode 100644 debian/patches/series/2 delete mode 100644 debian/patches/series/2-extra delete mode 100644 debian/patches/series/3 delete mode 100644 debian/patches/series/3-extra delete mode 100644 debian/patches/series/4 delete mode 100644 debian/patches/series/4-extra delete mode 100644 debian/patches/series/5 delete mode 100644 debian/patches/series/6 diff --git a/debian/patches/series/1 b/debian/patches/series/1 deleted file mode 100644 index e03451818..000000000 --- a/debian/patches/series/1 +++ /dev/null @@ -1,35 +0,0 @@ -+ debian/version.patch -+ debian/kernelvariables.patch -+ debian/doc-build-parallel.patch -+ debian/scripts-kconfig-reportoldconfig.patch -+ debian/powerpc-mkvmlinuz-support-ppc.patch -+ debian/powerpc-mkvmlinuz-support-powerpc.patch - -+ modular-ide-pnp.patch -+ bugfix/buslogic-pci-id-table.patch -+ fbdev-radeon-noaccel.patch -+ ia64-irq-affinity-upfix.patch -+ bugfix/powerpc/build-links.patch -+ bugfix/powerpc/prep-utah-ide-interrupt.patch -+ bugfix/powerpc/mv643xx-hotplug-support.patch -+ sparc64-hme-lockup.patch -+ sparc64-atyfb-xl-gr.patch -+ mips-arch-makefile.patch -+ mips-ide-scan.patch -+ mips-sb1-probe-ide.patch -+ mips-sb1-eth-napi.patch -+ mips-sb1-duart.patch -+ mips-sb1-duart-tts.patch -+ video-vino-64-bit-fix-kernel.diff -+ features/s390/drivers-ccw-uevent-modalias.patch -+ features/s390/drivers-ccw-uevent-cleanup.patch -+ arm-iop-generic-backport.patch -+ arm-iop-mtd-maps.patch -+ arm-iop-n2100.patch -+ arm-iop-glantank.patch -+ arm-get_unaligned-gcc41-const.patch -+ bugfix/powerpc/serial.patch -+ bugfix/powerpc/oldworld-boot-fix.patch -+ features/all/fs-asfs.patch -+ bugfix/advansys-pci-id-table.patch -+ bugfix/fdomain-pci-id-table.patch diff --git a/debian/patches/series/1-extra b/debian/patches/series/1-extra deleted file mode 100644 index 20af5b412..000000000 --- a/debian/patches/series/1-extra +++ /dev/null @@ -1,5 +0,0 @@ -+ debian/vserver-version.patch *_vserver *_xen-vserver -+ mips-tulip.patch mipsel -+ mips-tulip_dc21143.patch mipsel -+ mips-dec-scsi.patch mipsel -+ mips-dec-serial.patch mipsel diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 new file mode 100644 index 000000000..9f28ef068 --- /dev/null +++ b/debian/patches/series/1~experimental.1 @@ -0,0 +1,9 @@ ++ debian/version.patch ++ debian/kernelvariables.patch ++ debian/doc-build-parallel.patch ++ debian/scripts-kconfig-reportoldconfig.patch ++ debian/powerpc-mkvmlinuz-support-ppc.patch +#+ debian/powerpc-mkvmlinuz-support-powerpc.patch + +#+ features/all/fs-asfs.patch ++ features/mips/qemu-kernel.patch diff --git a/debian/patches/series/5-extra b/debian/patches/series/1~experimental.1-extra similarity index 84% rename from debian/patches/series/5-extra rename to debian/patches/series/1~experimental.1-extra index 812946ddf..763525012 100644 --- a/debian/patches/series/5-extra +++ b/debian/patches/series/1~experimental.1-extra @@ -1,3 +1,4 @@ ++ debian/vserver-version.patch *_vserver *_xen-vserver + features/all/vserver/vs2.0.2.2-rc6.patch *_vserver *_xen-vserver + features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver + features/all/xen/vserver-clash.patch *_xen-vserver diff --git a/debian/patches/series/2 b/debian/patches/series/2 deleted file mode 100644 index 1e0797395..000000000 --- a/debian/patches/series/2 +++ /dev/null @@ -1,5 +0,0 @@ -+ features/all/drivers/scsi-arcmsr-1.patch -+ features/all/drivers/scsi-arcmsr-2.patch -+ features/all/drivers/scsi-arcmsr-3.patch -+ features/all/drivers/net-r8169-1.patch -+ bugfix/proc-fb-reading.patch diff --git a/debian/patches/series/2-extra b/debian/patches/series/2-extra deleted file mode 100644 index 3813e3e42..000000000 --- a/debian/patches/series/2-extra +++ /dev/null @@ -1,6 +0,0 @@ -+ hppa.patch hppa -+ m68k-2.6.18.patch m68k -+ m68k-as.patch m68k -+ m68k-macro.patch m68k -+ m68k-no-backlight.patch m68k -+ m68k-fbcon.patch m68k diff --git a/debian/patches/series/3 b/debian/patches/series/3 deleted file mode 100644 index 83391de27..000000000 --- a/debian/patches/series/3 +++ /dev/null @@ -1,30 +0,0 @@ -+ alpha-prctl.patch -+ bugfix/mips/o32_fstatat_syscall.patch -+ bugfix/mips/fstatat_syscall_names.patch -+ bugfix/mips/sb1480_interrupt_fixes.patch -+ bugfix/mips/cobalt_hz.patch -+ bugfix/mips/real-cpu-cpuinfo.patch -+ bugfix/mips/workaround_gcc_options.patch -+ bugfix/mips/modules_msym32.patch -+ bugfix/mips/o32_personality.patch -+ bugfix/mips/compat_sys_mount.patch -+ bugfix/sky2-receive-FIFO-fix.patch -+ features/all/drivers/scsi-ahci-cleanup-1.patch -+ features/all/drivers/scsi-ahci-cleanup-2.patch -+ features/all/drivers/scsi-ahci-cleanup-3.patch -+ features/all/drivers/scsi-ahci-cleanup-4.patch -+ features/all/drivers/scsi-ahci-suspend-1.patch -+ features/all/drivers/scsi-ahci-suspend-2.patch -+ features/all/drivers/scsi-ahci-suspend-3.patch -+ features/all/drivers/cciss-support-for-gt-2TB-volumes.patch -+ bugfix/ia64/sal-flush-fix.patch -+ bugfix/sym2-dont-claim-raid-devs.patch -- bugfix/proc-fb-reading.patch -+ bugfix/2.6.18.1 -+ bugfix/rm-bsd-secure-level.patch -+ bugfix/dac960_ipr_pci_clash.patch -+ bugfix/via_pmu_backlight-fix_panic_sleep.patch -+ bugfix/serial_cs-resume.patch -+ bugfix/serial_core-suspend_oops.patch -+ bugfix/bluetooth_rfcomm_oops.patch -+ features/drm-i965.patch diff --git a/debian/patches/series/3-extra b/debian/patches/series/3-extra deleted file mode 100644 index c81a4d594..000000000 --- a/debian/patches/series/3-extra +++ /dev/null @@ -1 +0,0 @@ -+ hppa-fix-cross-compile.patch hppa diff --git a/debian/patches/series/4 b/debian/patches/series/4 deleted file mode 100644 index b47c6f882..000000000 --- a/debian/patches/series/4 +++ /dev/null @@ -1,49 +0,0 @@ -- bugfix/serial_cs-resume.patch -- bugfix/serial_core-suspend_oops.patch -- bugfix/dac960_ipr_pci_clash.patch -- sparc64-atyfb-xl-gr.patch -- bugfix/bluetooth_rfcomm_oops.patch -- bugfix/via_pmu_backlight-fix_panic_sleep.patch -- bugfix/sky2-receive-FIFO-fix.patch -+ bugfix/sparc/compat-alloc-user-space-alignment.patch -+ bugfix/arm/n2100-serial-irq.patch -+ bugfix/arm/n2100-eth1-irq.patch -+ bugfix/sparc/bus-id-size.patch -+ bugfix/net-netpoll.patch -+ features/net-forcedeth-swsusp.patch -+ bugfix/net-r8169-mmio8167.patch -+ features/net-r8169-pci_id-corega.patch -+ bugfix/net-r8169-hotplug_loop.patch -+ bugfix/arm/arm-generic-time.patch -+ bugfix/arm/ixp4xx-clocksource.patch -+ bugfix/net-r8169-no_mac_adress_change.patch -+ features/arm/nslu2-setup-mac.patch -+ features/arm/nslu2-eth-mac.patch -+ features/arm/ixp4xx-0.2.1-driver.patch -+ features/arm/ixp4xx-net-driver-fix-qmgr.patch -+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch -+ bugfix/powerpc/interrupt-alignement.patch -+ bugfix/sparc/sunblade1k-boot-fix.patch -+ bugfix/net-bcm43xx_netdev_watchdog.patch -+ bugfix/copy-user-highpage.patch -- mips-sb1-duart-tts.patch -+ bugfix/mips/syscall-wiring.patch -+ bugfix/mips/sb1-flush-cache-data-page.patch -+ bugfix/mips/trylock.patch -+ bugfix/mips/smp-cpu-bringup.patch -+ bugfix/mips/header-exports.patch -+ bugfix/mips/sb1-interrupt-handler.patch -+ bugfix/mips/cache-alias.patch -+ bugfix/mips/ip22-zilog-console.patch -+ bugfix/mips/signal-handling.patch -+ bugfix/mips/sb1-duart-tts.patch -+ bugfix/mips/wait-race.patch -+ bugfix/mips/sgi-ioc3.patch -+ features/mips/qemu-kernel.patch -+ features/mips/backtrace.patch -+ features/fintek-f75375.patch -+ bugfix/sparc/t1k-cpu-lockup.patch -+ bugfix/2.6.18.2 -+ bugfix/arm/iop3xx-mtd-map-fix.patch -+ features/input-atkb-supress-too-may-keys.patch -+ bugfix/s390-ftbfs-2.6.18.1.patch diff --git a/debian/patches/series/4-extra b/debian/patches/series/4-extra deleted file mode 100644 index d60955a83..000000000 --- a/debian/patches/series/4-extra +++ /dev/null @@ -1,4 +0,0 @@ -- mips-dec-scsi.patch mipsel -- mips-dec-serial.patch mipsel -+ bugfix/mips/dec-scsi.patch mipsel -+ bugfix/mips/dec-serial.patch mipsel diff --git a/debian/patches/series/5 b/debian/patches/series/5 deleted file mode 100644 index cda6fcb7d..000000000 --- a/debian/patches/series/5 +++ /dev/null @@ -1,7 +0,0 @@ -- bugfix/s390-ftbfs-2.6.18.1.patch -+ bugfix/s390-copy_from_user_padding_take2.patch -+ bugfix/copy-user-highpage-2.patch -- bugfix/ia64/sal-flush-fix.patch -+ bugfix/ia64/sal-flush-fix-upstream.patch -+ bugfix/alpha/asm-subarchs.patch -+ features/mips/qemu-le-config.patch diff --git a/debian/patches/series/6 b/debian/patches/series/6 deleted file mode 100644 index 0337c514a..000000000 --- a/debian/patches/series/6 +++ /dev/null @@ -1,24 +0,0 @@ -+ features/alpha/titan-video.patch -+ bugfix/alpha/srm-env-fixes.patch -+ features/mm-tracking-shared-dirty-pages.patch -+ features/mm-balance-dirty-pages.patch -+ features/mm-optimize-mprotect.patch -+ features/mm-install_page-cleanup.patch -+ features/mm-do_wp_page-fixup.patch -+ features/mm-msync-cleanup.patch -+ features/all/sctp-backports-1.patch -+ features/all/sctp-backports-2.patch -+ features/all/sctp-backports-3.patch -+ features/all/sctp-backports-4.patch -+ features/all/sctp-backports-5.patch -+ features/all/sctp-backports-6.patch -+ features/all/sctp-backports-7.patch -+ bugfix/bcm43xx-drain-tx-status-before-starting-irqs.patch -+ bugfix/arm/versatile-pci.patch -+ bugfix/arm/nslu2-disk-leds.patch -+ bugfix/UCR-61S2B-unusual_dev-update.patch -+ features/ti.patch -- bugfix/powerpc/interrupt-alignement.patch -- bugfix/s390-copy_from_user_padding_take2.patch -- bugfix/sparc/t1k-cpu-lockup.patch -+ bugfix/2.6.18.3