[kernel] r15628 - in dists/trunk/linux-2.6/debian: . config patches/bugfix/all patches/bugfix/all/stable patches/bugfix/powerpc patches/debian/dfsg patches/features/all patches/features/all/module-firmware patches/series
Maximilian Attems
maks at alioth.debian.org
Wed May 5 21:44:49 UTC 2010
Author: maks
Date: Wed May 5 21:44:47 2010
New Revision: 15628
Log:
sync to 2.6.34-rc6
disabled arm feature patches, nuked merged stuff, disabled aufs,
fixed orig generation.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/block-blk_abort_request-lock-fix.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/drivers-net-wireless-p54-txrx.c-Fix-off-by-one-error.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-further-spread-spectrum-fixes.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/hugetlb-fix-infinite-loop-in-get_futex_key-when-backed-by-huge-pages.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ipheth-potential-null-dereferences-on-error-path.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/libata-ata_piix-clear-spurious-IRQ.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/p54pci-move-tx-cleanup-into-tasklet.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/p54pci-revise-tx-locking.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/p54usb-Add-usbid-for-Corega-CG-WLUSB2GT.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/reiserfs-fix-permissions-on-reiserfs_priv.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.1.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.2.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.3.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/tipc-fix-oops-on-send-prior-to-entering-networked-mode.patch
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/kgdb-dont-needlessly-skip-PAGE_USER-test-for-Fsl-booke.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
dists/trunk/linux-2.6/debian/patches/features/all/drm-radeon-evergreen.patch
dists/trunk/linux-2.6/debian/patches/features/all/ipheth-add.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0025-tty-declare-MODULE_FIRMWARE-in-various-drivers.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0026-staging-declare-MODULE_FIRMWARE-in-various-drivers.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0027-sep-include-driver-name-in-firmware-filenames.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0028-sep-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0029-isight-firmware-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/rtl8192su-always-use-request_firmware.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/defines
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Wed May 5 21:41:16 2010 (r15627)
+++ dists/trunk/linux-2.6/debian/changelog Wed May 5 21:44:47 2010 (r15628)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.34~rc6-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- maximilian attems <maks at debian.org> Wed, 05 May 2010 22:57:24 +0200
+
linux-2.6 (2.6.33-1~experimental.5) experimental; urgency=low
[ Ian Campbell ]
Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines Wed May 5 21:41:16 2010 (r15627)
+++ dists/trunk/linux-2.6/debian/config/defines Wed May 5 21:44:47 2010 (r15628)
@@ -1,5 +1,5 @@
[abi]
-abiname: 2
+abiname: 1
[base]
arches:
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch Wed May 5 21:41:16 2010 (r15627)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch Wed May 5 21:44:47 2010 (r15628)
@@ -5,5 +5,5 @@
tristate "Atheros OTUS 802.11n USB wireless support"
+ depends on BROKEN
depends on USB && WLAN && MAC80211
- default N
- ---help---
+ select WIRELESS_EXT
+ select WEXT_PRIV
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch Wed May 5 21:41:16 2010 (r15627)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch Wed May 5 21:44:47 2010 (r15628)
@@ -5,7 +5,6 @@
@@ -2,5 +2,6 @@ config RTL8192SU
tristate "RealTek RTL8192SU Wireless LAN NIC driver"
depends on PCI && WLAN && USB
- depends on WIRELESS_EXT
+ depends on BROKEN
- default N
- ---help---
+ select WIRELESS_EXT
+ select WEXT_PRIV
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Wed May 5 21:41:16 2010 (r15627)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Wed May 5 21:44:47 2010 (r15628)
@@ -18,11 +18,11 @@
- adaptec/starfire_tx.bin
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
--fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.0.fw
--fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j3.fw \
-- bnx2/bnx2-rv2p-09-5.0.0.j3.fw \
-- bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw \
-- bnx2/bnx2-mips-06-5.0.0.j3.fw \
+-fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.13.0.fw bnx2x-e1h-5.2.13.0.fw
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j9.fw \
+- bnx2/bnx2-rv2p-09-5.0.0.j10.fw \
+- bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \
+- bnx2/bnx2-mips-06-5.0.0.j6.fw \
- bnx2/bnx2-rv2p-06-5.0.0.j3.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Wed May 5 21:41:16 2010 (r15627)
+++ dists/trunk/linux-2.6/debian/patches/series/base Wed May 5 21:44:47 2010 (r15628)
@@ -8,31 +8,23 @@
+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
-+ features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
-+ features/all/rt28x0sta-use-request_firmware.patch
+ features/all/lgs8gxx-lgs8g75-request_firmware.patch
+ features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
+ features/all/sound-pci-cs46xx-request_firmware.patch
-+ features/all/module-firmware/0025-tty-declare-MODULE_FIRMWARE-in-various-drivers.patch
-+ features/all/module-firmware/0026-staging-declare-MODULE_FIRMWARE-in-various-drivers.patch
-+ features/all/module-firmware/0027-sep-include-driver-name-in-firmware-filenames.patch
-+ features/all/module-firmware/0028-sep-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0029-isight-firmware-declare-MODULE_FIRMWARE.patch
-
# patches from aufs2 repository, with s/EXPORT_SYMBOL/&_GPL/
-+ features/all/aufs2/aufs2-base.patch
-+ features/all/aufs2/aufs2-standalone.patch
-+ features/all/aufs2/aufs2-kbuild.patch
+#+ features/all/aufs2/aufs2-base.patch
+#+ features/all/aufs2/aufs2-standalone.patch
+#+ features/all/aufs2/aufs2-kbuild.patch
# content of fs/ and include/ from aufs2 repository
-+ features/all/aufs2/aufs2-add.patch
+#+ features/all/aufs2/aufs2-add.patch
# mark as staging/crap
-+ features/all/aufs2/mark-as-staging.patch
+#+ features/all/aufs2/mark-as-staging.patch
# content of src/ from speakup package; generated with:
# diff -ur --unidirectional-new-file nonexistent src | filterdiff --strip=1 --addoldprefix=a/drivers/staging/speakup/ --addnewprefix=b/drivers/staging/speakup/
+ features/all/speakup/speakup-add.patch
-+ features/all/speakup/speakup-kbuild.patch
+#+ features/all/speakup/speakup-kbuild.patch
#+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
@@ -40,25 +32,19 @@
+ bugfix/mips/disable-werror.patch
+ bugfix/powerpc/lpar-console.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
-+ debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
-+ features/arm/compression-add-lzma.patch
-+ features/arm/openrd-client.patch
+#+ features/arm/compression-add-lzma.patch
+#+ features/arm/openrd-client.patch
+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
-+ bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
++ bugfix/ia65/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
+ debian/sysrq-mask.patch
-+ features/arm/dns323-rev-a1-powerled.patch
-+ features/arm/openrd-base-uart.patch
-+ features/all/rtl8192su-always-use-request_firmware.patch
-
-+ bugfix/all/stable/2.6.33.1.patch
-+ bugfix/all/stable/2.6.33.2.patch
+#+ features/arm/dns323-rev-a1-powerled.patch
+#+ features/arm/openrd-base-uart.patch
+ debian/arch-sh4-fix-uimage-build.patch
-+ bugfix/all/stable/2.6.33.3.patch
+ features/all/phylib-Support-phy-module-autoloading.patch
+ features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch
@@ -66,31 +52,13 @@
+ bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch
+ bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch
+ features/arm/dns323-rev-a1-gpio-request.patch
-+ bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter.patch
-+ bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch
-+ bugfix/all/reiserfs-fix-permissions-on-reiserfs_priv.patch
-+ bugfix/all/libata-ata_piix-clear-spurious-IRQ.patch
-+ bugfix/all/block-blk_abort_request-lock-fix.patch
+ bugfix/mips/enable-pata-platform.patch
+ bugfix/all/rndis_host-Poll-status-channel-before-control-channel.patch
-+ features/all/ipheth-add.patch
-+ bugfix/all/ipheth-potential-null-dereferences-on-error-path.patch
-+ bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch
+ bugfix/all/thinkpad-acpi-add-x100e.patch
-+ features/all/drm-radeon-evergreen.patch
-+ bugfix/all/drm-radeon-kms-further-spread-spectrum-fixes.patch
-+ bugfix/all/p54pci-move-tx-cleanup-into-tasklet.patch
-+ bugfix/all/p54pci-revise-tx-locking.patch
-+ bugfix/all/p54usb-Add-usbid-for-Corega-CG-WLUSB2GT.patch
-+ bugfix/all/drivers-net-wireless-p54-txrx.c-Fix-off-by-one-error.patch
+ bugfix/all/p54pci-prevent-stuck-rx-ring.patch
+ bugfix/all/p54pci-fix-serious-sparse-warning.patch
+ bugfix/all/p54pci-fix-bugs-in-p54p_check_tx_ring.patch
+ bugfix/all/p54pci-fix-regression.patch
-+ bugfix/all/hugetlb-fix-infinite-loop-in-get_futex_key-when-backed-by-huge-pages.patch
-+ bugfix/all/ext4-issue-discard-operation-before-releasing-blocks.patch
+ bugfix/all/libiscsi-regression-fix-header-digest-errors.patch
+ bugfix/all/sctp-fix-skb_over_panic-resulting-from-multiple-invalid-parameter-errors.patch
+ bugfix/all/cifs-allow-null-nd-on-create.patch
-+ bugfix/all/tipc-fix-oops-on-send-prior-to-entering-networked-mode.patch
-+ bugfix/powerpc/kgdb-dont-needlessly-skip-PAGE_USER-test-for-Fsl-booke.patch
More information about the Kernel-svn-changes
mailing list