[kernel] r15185 - in dists/trunk/linux-2.6/debian: . config patches/bugfix/all patches/bugfix/all/stable patches/bugfix/arm patches/bugfix/mips patches/debian patches/debian/dfsg patches/features/all patches/features/all/aufs2 patches/features/all/module-firmware patches/features/all/speakup patches/features/all/vserver patches/features/arm patches/series
Maximilian Attems
maks at alioth.debian.org
Thu Feb 18 13:22:37 UTC 2010
Author: maks
Date: Thu Feb 18 13:22:31 2010
New Revision: 15185
Log:
rebase to 2.6.33-rc8 new upstream release
fix orig generation
* rediff various staging Kconfig and firmware patches
* rt3090 is gone
nuke evident stable, stable merged, sfc features and
MODULE_FIRMWARE (hopefully all merged ;) patches.
fix speakup patch to apply to latest staging.
auffs needs newer tree and maybe we can get rid of it postsqueeze,
so didn't try at all, just nuked.
disable vserver again for now.
merged all series file into base.
TODO: still a some stray patches, but not that urgent..
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/DocBook-media-copy-images-after-building-HTML.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/DocBook-media-create-links-for-included-sources.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/Documentation-3c509-document-ethtool-support.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/Fix-flush_old_exec-setup_new_exec-split.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ath5k-Fix-eeprom-checksum-check-for-custom-sized-eeproms.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/atl1c-use-common_task-instead-of-reset_task-and-link.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/atl1e-remove-broken-tsov6.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/dmfe-tulip-Let-dmfe-handle-DM910x-except-SPARC-onboard.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/e1000-enhance-fragment-detection.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-fragment-detection.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/fdpic-respect-pt_gnu_stack-exec-protection-markings-when-creating-nommu-stack.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/fix-potential-crash-with-sys_move_pages.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/modules-Skip-empty-section-notes.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/netfilter-xtables-fix-conntrack-match-v1-ipt-save-output.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/radeon-fix-crtc-vblank-update-for-r600.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Add-workspace-for-GMAC-bug-workaround.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Disable-TX-descriptor-prefetch-watchdog.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Fix-DMA-mapping-cleanup-on-error-in-TSO.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Fix-conditions-for-MDIO-self-test.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Fix-polling-for-slow-MCDI-operations.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Include-XGXS-in-XMAC-link-status-check.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Move-PHY-software-state-initialisation.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Add-error-message-for-suspected-bad-SFP-cable.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Switch-into-self-configure-mode.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-bug.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-QT2025C-Work-around-PHY-firmware-initialisation.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-QT202x-Remove-unreliable-MMD-check.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/sfc-Use-fixed-size-buffers-for-MCDI-NVRAM-requests.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/split-flush_old_exec-into-two-functions.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.1.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.2.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.3.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.4.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.5.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.6.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.7.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.8.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch
dists/trunk/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch
dists/trunk/linux-2.6/debian/patches/debian/arch-mips-not-embedded.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/sched-fix-conflict-between-2.6.32.7-and-vserver.patch
dists/trunk/linux-2.6/debian/patches/features/all/SCSI-3w-sas-Add-new-driver-for-LSI-3ware-9750.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-20091205.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-20100125.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-add.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-base.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-kbuild.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-standalone.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/mark-as-staging.patch
dists/trunk/linux-2.6/debian/patches/features/all/ethtool-Add-reset-operation.patch
dists/trunk/linux-2.6/debian/patches/features/all/gro-Change-all-receive-functions-to-return-GRO-result.patch
dists/trunk/linux-2.6/debian/patches/features/all/gro-Name-the-GRO-result-enumeration-type.patch
dists/trunk/linux-2.6/debian/patches/features/all/input-alps-add-support-for-touchpads-with-4-directional-button.patch
dists/trunk/linux-2.6/debian/patches/features/all/macvlan-Copy-functions-from-2.6.33-net-core-dev-c.patch
dists/trunk/linux-2.6/debian/patches/features/all/macvlan-Precise-RX-stats-accounting.patch
dists/trunk/linux-2.6/debian/patches/features/all/macvlan-cleanup-rx-statistics.patch
dists/trunk/linux-2.6/debian/patches/features/all/macvlan-export-macvlan-mode-through-netlink.patch
dists/trunk/linux-2.6/debian/patches/features/all/macvlan-implement-bridge-VEPA-and-private-mode.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0001-netxen-module-firmware-hints.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0002-netx-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0003-solos-pci-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0004-ambassador-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0005-bnx2x-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0006-cxgb3-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0007-myri10ge-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0008-spider-net-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0009-tms380tr-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0010-pcnet-cs-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0011-speedfax-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0012-at76c50x-usb-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0013-atmel-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0014-ipw2100-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0015-ipw2200-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0016-iwmc3200wifi-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0017-libertas-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0018-libertas_tf_usb-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0019-mwl8k-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0020-orinoco-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0021-prism54-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0022-wl12xx-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0023-zd1201-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0024-zd1211rw-declare-MODULE_FIRMWARE.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/module-firmware/0030-btmrvl-sdio-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/r8169-init-phy-return-error.patch
dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/sfc-2.6.33-rc1.patch
dists/trunk/linux-2.6/debian/patches/features/all/vserver/bindmount-dev.patch
dists/trunk/linux-2.6/debian/patches/features/all/vserver/ia64-buildfix.patch
dists/trunk/linux-2.6/debian/patches/features/all/vserver/s390-buildfix.patch
dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.27.patch
dists/trunk/linux-2.6/debian/patches/features/all/wireless-report-reasonable-bitrate-for-MCS-rates-th.patch
dists/trunk/linux-2.6/debian/patches/features/arm/dns323-rev-b1-poweroff.patch
dists/trunk/linux-2.6/debian/patches/features/arm/early-printk.patch
dists/trunk/linux-2.6/debian/patches/series/2
dists/trunk/linux-2.6/debian/patches/series/3
dists/trunk/linux-2.6/debian/patches/series/3-extra
dists/trunk/linux-2.6/debian/patches/series/4
dists/trunk/linux-2.6/debian/patches/series/4-extra
dists/trunk/linux-2.6/debian/patches/series/5
dists/trunk/linux-2.6/debian/patches/series/6
dists/trunk/linux-2.6/debian/patches/series/7
dists/trunk/linux-2.6/debian/patches/series/8
dists/trunk/linux-2.6/debian/patches/series/9
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-rt2860-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-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/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
dists/trunk/linux-2.6/debian/patches/series/base
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 Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/changelog Thu Feb 18 13:22:31 2010 (r15185)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.33~rc8-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- maximilian attems <maks at debian.org> Mon, 15 Feb 2010 23:54:52 +0200
+
linux-2.6 (2.6.32-9) UNRELEASED; urgency=low
[ Ben Hutchings ]
Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/config/defines Thu Feb 18 13:22:31 2010 (r15185)
@@ -23,7 +23,7 @@
xen
[featureset-vserver_base]
-enabled: true
+enabled: false
[featureset-xen_base]
enabled: false
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -1,9 +1,12 @@
+diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
+index f9962b6..8d2da65 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
config RT2860
- tristate "Ralink 2860 wireless support"
-+ depends on BROKEN
+ tristate "Ralink 2860/3090 wireless support"
depends on PCI && X86 && WLAN
++ depends on BROKEN
+ select WIRELESS_EXT
+ select WEXT_PRIV
---help---
- This is an experimental driver for the Ralink 2860 wireless chip.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -1,9 +1,12 @@
+diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
+index fd3ba3a..ce46b49 100644
--- a/drivers/staging/rt2870/Kconfig
+++ b/drivers/staging/rt2870/Kconfig
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
config RT2870
tristate "Ralink 2870/3070 wireless support"
-+ depends on BROKEN
depends on USB && X86 && WLAN
++ depends on BROKEN
+ select WIRELESS_EXT
+ select WEXT_PRIV
---help---
- This is an experimental driver for the Ralink xx70 wireless chips.
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 Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -1,9 +1,11 @@
+diff --git a/drivers/staging/rtl8192su/Kconfig b/drivers/staging/rtl8192su/Kconfig
+index 123fa6d..5e081b1 100644
--- a/drivers/staging/rtl8192su/Kconfig
+++ b/drivers/staging/rtl8192su/Kconfig
-@@ -1,5 +1,6 @@
- config RTL8192SU
+@@ -2,5 +2,6 @@ config RTL8192SU
tristate "RealTek RTL8192SU Wireless LAN NIC driver"
-+ depends on BROKEN
- depends on PCI && WLAN
+ depends on PCI && WLAN && USB
depends on WIRELESS_EXT
++ depends on BROKEN
default N
+ ---help---
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 Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -1,6 +1,8 @@
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 1c00d05..3bf888d 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,122 +20,19 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,53 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
# accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
# But be aware that the config file might not be included at all.
@@ -16,7 +18,7 @@
- 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.0.21.0.fw bnx2x-e1h-5.0.21.0.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 \
@@ -53,10 +55,8 @@
-fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
cis/DP83903.cis cis/NE2K.cis \
- cis/tamarack.cis cis/PE-200.cis
- fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
- fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
- fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
+ cis/tamarack.cis cis/PE-200.cis \
+@@ -77,66 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
cis/COMpad2.cis cis/COMpad4.cis \
cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
cis/SW_8xx_SER.cis
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -16,7 +16,7 @@
{ 0x06, 0x5561 }
};
+#ifdef REMOVE_DFSG
- static struct phy_reg phy_reg_init_2[] = {
+ static const struct phy_reg phy_reg_init_2[] = {
{ 0x1f, 0x0005 },
{ 0x05, 0xffc2 },
@@ -2074,6 +2075,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
@@ -42,7 +42,7 @@
{ 0x06, 0x5561 }
};
+#ifdef REMOVE_DFSG
- static struct phy_reg phy_reg_init_1[] = {
+ static const struct phy_reg phy_reg_init_1[] = {
{ 0x1f, 0x0005 },
{ 0x05, 0xffc2 },
@@ -2473,6 +2478,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -1,5 +1,5 @@
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index fa8c2dd..7936c57 100644
+index 999e8a7..3b5d4ba 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -3,7 +3,7 @@
@@ -11,7 +11,7 @@
ifdef KBUILD_KCONFIG
Kconfig := $(KBUILD_KCONFIG)
-@@ -25,9 +25,15 @@ config: $(obj)/conf
+@@ -26,10 +26,16 @@ config: $(obj)/conf
oldconfig: $(obj)/conf
$< -o $(Kconfig)
@@ -19,6 +19,7 @@
+ $< -R $(Kconfig)
+
silentoldconfig: $(obj)/conf
+ $(Q)mkdir -p include/generated
$< -s $(Kconfig)
+updateoldconfig: $(obj)/conf
Modified: dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Thu Feb 18 13:22:31 2010 (r15185)
@@ -4,9 +4,9 @@
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -126,6 +126,8 @@
- source "drivers/staging/sep/Kconfig"
+ source "drivers/staging/netwave/Kconfig"
- source "drivers/staging/iio/Kconfig"
+ source "drivers/staging/sm7xx/Kconfig"
+
+source "drivers/staging/speakup/Kconfig"
@@ -15,9 +15,9 @@
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -45,3 +45,4 @@
- obj-$(CONFIG_RAR_REGISTER) += rar/
- obj-$(CONFIG_DX_SEP) += sep/
- obj-$(CONFIG_IIO) += iio/
+ obj-$(CONFIG_PCMCIA_WAVELAN) += wavelan/
+ obj-$(CONFIG_PCMCIA_NETWAVE) += netwave/
+ obj-$(CONFIG_FB_SM7XX) += sm7xx/
+obj-$(CONFIG_SPEAKUP) += speakup/
--- a/drivers/staging/speakup/Kbuild
+++ b/drivers/staging/speakup/Kbuild
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/series/base Thu Feb 18 13:22:31 2010 (r15185)
@@ -2,28 +2,23 @@
+ debian/kernelvariables.patch
+ debian/doc-build-parallel.patch
+ debian/scripts-kconfig-reportoldconfig.patch
-+ debian/arch-mips-not-embedded.patch
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/drivers-ata-pata_sis-postpone-pata.patch
+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
-+ features/all/drivers-staging-rt28x0sta-request_firmware.patch
+
+# FIXME: fails to apply
+# + features/all/drivers-staging-rt28x0sta-request_firmware.patch
+ features/all/export-unionfs-symbols.patch
+ features/all/lgs8gxx-lgs8g75-request_firmware.patch
-+ features/all/r8169-init-phy-return-error.patch
-+ features/all/r8169-rtl8168d-1-2-request_firmware.patch
+# FIXME: fails to apply
+#+ features/all/r8169-rtl8168d-1-2-request_firmware.patch
+ features/all/sound-pci-cs46xx-request_firmware.patch
+# FIXME: 2.6.33 tree
# 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
-# content of fs/ and include/ from aufs2 repository
-+ features/all/aufs2/aufs2-add.patch
-# mark as staging/crap
-+ 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/
@@ -34,7 +29,8 @@
#+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
+ bugfix/arm/disable-scsi_acard.patch
-+ bugfix/mips/disable-werror.patch
+# FIXME: no longer applies
+#+ bugfix/mips/disable-werror.patch
+ bugfix/fix-hifn_795X-divdi3.patch
+ bugfix/powerpc/mm-mol.patch
+ bugfix/powerpc/lpar-console.patch
@@ -42,42 +38,38 @@
#+ features/sparc/video-sunxvr500-intergraph.patch
+ bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch
+ debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
-+ features/arm/compression-use-generic-gzip.patch
-+ features/arm/compression-add-lzmo.patch
-+ features/arm/openrd-client.patch
-+ features/arm/ts41x.patch
-+ bugfix/arm/scsi-osd-build-fix.patch
-+ bugfix/mips/drm-ttm-build-fix.patch
-+ bugfix/all/DocBook-media-copy-images-after-building-HTML.patch
-+ bugfix/all/DocBook-media-create-links-for-included-sources.patch
-+ features/all/mmc-parameter-set-whether-cards-are-assumed-removable.patch
-
-+ features/all/module-firmware/0001-netxen-module-firmware-hints.patch
-+ features/all/module-firmware/0002-netx-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0003-solos-pci-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0004-ambassador-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0005-bnx2x-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0006-cxgb3-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0007-myri10ge-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0008-spider-net-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0009-tms380tr-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0010-pcnet-cs-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0011-speedfax-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0012-at76c50x-usb-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0013-atmel-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0014-ipw2100-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0015-ipw2200-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0016-iwmc3200wifi-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0017-libertas-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0018-libertas_tf_usb-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0019-mwl8k-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0020-orinoco-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0021-prism54-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0022-wl12xx-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0023-zd1201-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0024-zd1211rw-declare-MODULE_FIRMWARE.patch
-
-+ bugfix/all/atl1e-remove-broken-tsov6.patch
-+ features/all/atl1e-allow-offload-disable.patch
-+ bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch
-+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
+# FIXME: no longer applies
+#+ features/arm/compression-use-generic-gzip.patch
+#+ features/arm/compression-add-lzmo.patch
+#+ features/arm/openrd-client.patch
+#+ features/arm/ts41x.patch
+#+ features/all/mmc-parameter-set-whether-cards-are-assumed-removable.patch
+
+#+ bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch
+#+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
+
++ bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
+# FIXME
+#+ features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
+
++ bugfix/all/drm-i915-disable-powersave.patch
+# FIXME:
+#- features/all/drivers-staging-rt28x0sta-request_firmware.patch
+#+ features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
+#+ features/all/rt28x0sta-use-request_firmware.patch
+#+ features/all/rt3090sta-use-request_firmware.patch
+#+ features/all/input-alps-add-support-for-touchpads-with-4-directional-button-2.patch
+
+
++ bugfix/all/cxusb-select-lgs8gxx.patch
+# FIXME:
+#+ bugfix/x86/kvm-pit-control-word-is-write-only.patch
+#+ bugfix/x86/kvm-fix-memory-access-during-x86-emulation.patch
+#+ bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch
+#+ bugfix/x86/kvm-Fix-popf-emulation.patch
+#+ bugfix/x86/kvm-Check-CPL-level-during-privilege-instruction-emulation.patch
+
+
++ bugfix/all/cxusb-dont-select-lgs8gl5.patch
++ debian/sysrq-mask.patch
++ bugfix/all/efifb_fix_v2.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Thu Feb 18 04:45:57 2010 (r15184)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Thu Feb 18 13:22:31 2010 (r15185)
@@ -5,7 +5,6 @@
+ debian/dfsg/drivers-staging-otus-disable.patch
+ debian/dfsg/drivers-staging-rt2860-disable.patch
+ debian/dfsg/drivers-staging-rt2870-disable.patch
-+ debian/dfsg/drivers-staging-rt3090-disable.patch
+ debian/dfsg/drivers-staging-rtl8192su-disable.patch
+ debian/dfsg/firmware-cleanup.patch
+ debian/dfsg/lgs8gxx-lgs8g75-disable.patch
More information about the Kernel-svn-changes
mailing list