[kernel] r11252 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/m68k/2.6.24 patches/debian/dfsg patches/series
Maximilian Attems
maks at alioth.debian.org
Sun May 4 13:28:53 UTC 2008
Author: maks
Date: Sun May 4 13:28:19 2008
New Revision: 11252
Log:
update to 2.6.26-rc1
* refresh dfsg orig patches:
- usb serial
- usb misc
* rm dabusb firmware patch as merged
* disable bnx2 request firmware patch, fails to apply
* nuke old m68k 2.6.24 patches, just in the way
Removed:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-git18
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/130-adbraw.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/134-atari-fat.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/141-ide.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/143-ioext.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/149-mc68681.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/152-pci.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/448-ide.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/478-serial.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/633-atari_scc.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/amiga-debug=mem.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/amiga-platform-device.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/amiga-platform-device2.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/atari-aranym.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/atari-ethernat.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/atari-ethernec.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/atari-platform-device.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/atari-rom-isa.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/b43-depends-on-HAS_DMA.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/blinux-list-is-subscribers-only.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/checkpatch-print-filenames.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/falconide_intr_lock-ratelimit.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/m68k-initrd-fix.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/m68k-q40ints.c-needs-asm-floppy.h.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/m68k-replace-linux-68k-by-linux-m68k.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/m68k-scsi-HOST_C-cleanup.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/mac-platform-device.diff
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/series-extra
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.24/zorro-module-device-table.diff
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus-license.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan-remove.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
dists/trunk/linux-2.6/debian/patches/series/orig-0
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sun May 4 13:28:19 2008
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.25-1~git.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.26~rc1-1~experimental.1) UNRELEASED; urgency=low
[ maximilian attems ]
* topconfig set CRYPTO_CTS, SND_PCSP, SND_AW2, IWL4965_LEDS, IWL3945_LEDS,
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch Sun May 4 13:28:19 2008
@@ -34,17 +34,17 @@
- module will be called emi26.
-
config USB_ADUTUX
- tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)"
- depends on USB && EXPERIMENTAL
+ tristate "ADU devices from Ontrak Control Systems"
+ depends on USB
diff -ruN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
--- a/drivers/usb/misc/Makefile 2007-02-04 19:44:54.000000000 +0100
+++ b/drivers/usb/misc/Makefile 2007-02-05 16:45:42.000000000 +0100
-@@ -8,8 +8,6 @@
- obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
+@@ -9,8 +9,6 @@
+ obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o
obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
obj-$(CONFIG_USB_CYTHERM) += cytherm.o
-obj-$(CONFIG_USB_EMI26) += emi26.o
-obj-$(CONFIG_USB_EMI62) += emi62.o
obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o
obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
- obj-$(CONFIG_USB_LCD) += usblcd.o
+ obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan-remove.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan-remove.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan-remove.patch Sun May 4 13:28:19 2008
@@ -2,15 +2,15 @@
index 43d6db6..61c13e3 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
-@@ -313,6 +313,7 @@ config USB_SERIAL_KEYSPAN_PDA
+@@ -290,6 +290,7 @@ config USB_SERIAL_KEYSPAN_PDA
config USB_SERIAL_KEYSPAN
tristate "USB Keyspan USA-xxx Serial Driver"
+ depends on BROKEN
- depends on USB_SERIAL
select USB_EZUSB
---help---
-@@ -326,84 +327,6 @@ config USB_SERIAL_KEYSPAN
+ Say Y here if you want to use Keyspan USB to serial converter
+@@ -302,84 +303,6 @@ config USB_SERIAL_KEYSPAN
To compile this driver as a module, choose M here: the
module will be called keyspan.
@@ -93,5 +93,5 @@
- Say Y here to include firmware for the USA-49WLC converter.
-
config USB_SERIAL_KLSI
- tristate "USB KL5KUSB105 (Palmconnect) Driver (EXPERIMENTAL)"
- depends on USB_SERIAL && EXPERIMENTAL
+ tristate "USB KL5KUSB105 (Palmconnect) Driver"
+ ---help---
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Sun May 4 13:28:19 2008
@@ -1,4 +1,3 @@
-+ bugfix/all/patch-2.6.25-git18
+ debian/version.patch
+ debian/kernelvariables.patch
+ debian/doc-build-parallel.patch
@@ -8,7 +7,7 @@
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/dfsg/drivers-net-tg3-fix-simple.patch
-+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
+#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
+ features/all/export-gfs2-locking-symbols.patch
+ features/all/export-unionfs-symbols.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra Sun May 4 13:28:19 2008
@@ -1,38 +1,5 @@
+ features/all/vserver/vs2.2.0-rc5.patch featureset=vserver featureset=xen-vserver
+ features/all/vserver/bindmount-dev.patch featureset=vserver featureset=xen-vserver
-# --- submitted
-+ bugfix/m68k/2.6.24/m68k-initrd-fix.diff arch=m68k
-
-
-# --- pending ---
-+ bugfix/m68k/2.6.24/633-atari_scc.diff arch=m68k
-#+ bugfix/m68k/2.6.24/130-adbraw.diff arch=m68k
-#+ bugfix/m68k/2.6.24/133-arch.diff arch=m68k
-#+ bugfix/m68k/2.6.24/134-atari-fat.diff arch=m68k
-+ bugfix/m68k/2.6.24/141-ide.diff arch=m68k
-+ bugfix/m68k/2.6.24/143-ioext.diff arch=m68k
-+ bugfix/m68k/2.6.24/149-mc68681.diff arch=m68k
-+ bugfix/m68k/2.6.24/152-pci.diff arch=m68k
-#+ bugfix/m68k/2.6.24/448-ide.diff arch=m68k
-+ bugfix/m68k/2.6.24/478-serial.diff arch=m68k
-#+ bugfix/m68k/2.6.24/atari-rom-isa.diff arch=m68k
-+ bugfix/m68k/2.6.24/atari-ethernec.diff arch=m68k
-+ bugfix/m68k/2.6.24/atari-aranym.diff arch=m68k
-#+ bugfix/m68k/2.6.24/atari-ethernat.diff arch=m68k
-
-+ bugfix/m68k/2.6.24/falconide_intr_lock-ratelimit.diff arch=m68k
-#+ bugfix/m68k/2.6.24/zorro-module-device-table.diff arch=m68k
-+ bugfix/m68k/2.6.24/m68k-q40ints.c-needs-asm-floppy.h.diff arch=m68k
-+ bugfix/m68k/2.6.24/blinux-list-is-subscribers-only.diff arch=m68k
-+ bugfix/m68k/2.6.24/b43-depends-on-HAS_DMA.diff arch=m68k
-+ bugfix/m68k/2.6.24/amiga-debug=mem.diff arch=m68k
-+ bugfix/m68k/2.6.24/m68k-scsi-HOST_C-cleanup.diff arch=m68k
-+ bugfix/m68k/2.6.24/amiga-platform-device.diff arch=m68k
-+ bugfix/m68k/2.6.24/atari-platform-device.diff arch=m68k
-+ bugfix/m68k/2.6.24/mac-platform-device.diff arch=m68k
-#+ bugfix/m68k/2.6.24/checkpatch-print-filenames.diff arch=m68k
-#+ bugfix/m68k/2.6.24/m68k-replace-linux-68k-by-linux-m68k.diff arch=m68k
-+ bugfix/m68k/2.6.24/amiga-platform-device2.diff arch=m68k
#+ features/all/xen/vmlinuz-target.patch featureset=xen
#+ features/all/xen/blkfront-protocol.patch featureset=xen
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Sun May 4 13:28:19 2008
@@ -3,7 +3,6 @@
+ debian/dfsg/drivers-atm.patch
+ debian/dfsg/drivers-char-computone.patch
+ debian/dfsg/drivers-media-dvb-ttusb-budget.patch
-+ debian/dfsg/drivers-media-video-dabus-license.patch
+ debian/dfsg/drivers-net-acenic-remove.patch
+ debian/dfsg/drivers-net-bnx2-disable.patch
+ debian/dfsg/drivers-net-bnx2x-disable.patch
More information about the Kernel-svn-changes
mailing list