[kernel] r12854 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all/stable patches/debian patches/debian/dfsg patches/series
Maximilian Attems
maks at alioth.debian.org
Thu Feb 19 13:50:14 UTC 2009
Author: maks
Date: Thu Feb 19 13:50:11 2009
New Revision: 12854
Log:
update to 2.6.29-rc5
- all stable patches dropped
- tg3 finaly uses firmware_request(), corresponding patches dropped.
- nuke acenic, tg3, e100, cassini, starfire, cxgb3 firmware on orig
tarball generation.
- no longer disable acenic.
- update firmware-cleanup.patch to all those new ones.
- trivial update scripts-kconfig-reportoldconfig.patch
- disable some arm feature patches that no longer apply
Added:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
- copied, changed from r12853, /dists/trunk/linux-2.6/debian/patches/series/1
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
- copied, changed from r12853, /dists/trunk/linux-2.6/debian/patches/series/1-extra
Removed:
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/patch-2.6.28.1
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/patch-2.6.28.2
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/patch-2.6.28.3
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/patch-2.6.28.4
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/patch-2.6.28.5
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/patch-2.6.28.6
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-acenic-remove.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-fix-simple.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-mark.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch
dists/trunk/linux-2.6/debian/patches/series/1
dists/trunk/linux-2.6/debian/patches/series/1-extra
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
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 Thu Feb 19 13:50:11 2009
@@ -1,3 +1,15 @@
+linux-2.6 (2.6.29~rc5-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - tg3 use request_firmware and firmware nuked
+ - acenic use request_firmware and firmware nuked
+ - e100 use request_firmware and firmware nuked
+ - cassini use request_firmware and firmware nuked
+ - starfire use request_firmware and firmware nuked
+ - cxgb3 use request_firmware and firmware nuked
+
+ -- maximilian attems <maks at debian.org> Thu, 19 Feb 2009 13:25:20 +0100
+
linux-2.6 (2.6.28-2) UNRELEASED; urgency=low
[ Martin Michlmayr ]
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Thu Feb 19 13:50:11 2009
@@ -2,9 +2,13 @@
rm firmware/*.HEX
rm firmware/*.ihex
+rm firmware/acenic
+rm firmware/adaptec
rm firmware/cpia2
+rm firmware/cxgb3
rm firmware/dabusb
rm firmware/dsp56k
+rm firmware/e100
rm firmware/edgeport
rm firmware/emi26
rm firmware/emi62
@@ -13,14 +17,12 @@
rm firmware/keyspan
rm firmware/korg
rm firmware/sb16
+rm firmware/sun
+rm firmware/tigon
rm firmware/ttusb-budget
rm firmware/vicam
rm firmware/yamaha
-rm drivers/net/acenic_firmware.h
-
-unifdef drivers/net/tg3.c -UREMOVE_DFSG
-
rm drivers/net/appletalk/cops.c
rm drivers/net/appletalk/cops.h
rm drivers/net/appletalk/cops_ffdrv.h
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 (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Thu Feb 19 13:50:11 2009
@@ -1,14 +1,30 @@
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 466106f..fea3504 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,58 +20,8 @@
+@@ -20,75 +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.
+-ifdef CONFIG_ACENIC_OMIT_TIGON_I
+-acenic-objs := acenic/tg2.bin
+-fw-shipped- += acenic/tg1.bin
+-else
+-acenic-objs := acenic/tg1.bin acenic/tg2.bin
+-endif
+-fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)
+-fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
+- adaptec/starfire_tx.bin
-fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
+-fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
+- cxgb3/t3c_psram-1.1.0.bin \
+- cxgb3/t3fw-7.0.0.bin
-fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
+-fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
+- e100/d102e_ucode.bin
-fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
-fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
-fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
@@ -19,6 +35,8 @@
- sb16/ima_adpcm_capture.csp
-fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
- yamaha/ds1e_ctrl.fw
+-fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
+- tigon/tg3_tso5.bin
-fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
-fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
- emi26/bitstream.fw
@@ -46,7 +64,8 @@
- keyspan/usa28.fw keyspan/usa28xa.fw keyspan/usa28xb.fw \
- keyspan/usa28x.fw keyspan/usa49w.fw keyspan/usa49wlc.fw
-endif
--fw-shipped-$(CONFIG_USB_SERIAL_TI) += ti_3410.fw ti_5052.fw
+-fw-shipped-$(CONFIG_USB_SERIAL_TI) += ti_3410.fw ti_5052.fw \
+- mts_cdma.fw mts_gsm.fw mts_edge.fw
-fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT) += edgeport/boot.fw edgeport/boot2.fw \
- edgeport/down.fw edgeport/down2.fw
-fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT_TI) += edgeport/down3.bin
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 (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Thu Feb 19 13:50:11 2009
@@ -205,14 +205,14 @@
case S_STRING:
case S_INT:
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
-index 9d4cba1..439608b 100644
+index 6408fef..9d276f6 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
-@@ -100,6 +100,7 @@ struct symbol {
- #define SYMBOL_DEF_AUTO 0x20000
- #define SYMBOL_DEF3 0x40000
- #define SYMBOL_DEF4 0x80000
-+#define SYMBOL_CHANGED_REAL 0x100000
+@@ -106,6 +106,7 @@ struct symbol {
+ #define SYMBOL_DEF_AUTO 0x20000 /* symbol.def[S_DEF_AUTO] is valid */
+ #define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */
+ #define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */
++#define SYMBOL_CHANGED_REAL 0x100000
#define SYMBOL_MAXLENGTH 256
#define SYMBOL_HASHSIZE 257
Copied: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (from r12853, /dists/trunk/linux-2.6/debian/patches/series/1)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/series/1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Thu Feb 19 13:50:11 2009
@@ -1,12 +1,11 @@
+ debian/version.patch
-+ debian/kernelvariables.patch
+#+ debian/kernelvariables.patch
+ debian/doc-build-parallel.patch
+ debian/scripts-kconfig-reportoldconfig.patch
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/drivers-ata-pata_sis-postpone-pata.patch
-+ debian/dfsg/drivers-net-tg3-fix-simple.patch
#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
#+ features/all/drivers-net-acenic-firmwar_request.patch
+ features/all/export-gfs2-locking-symbols.patch
@@ -23,12 +22,6 @@
+ bugfix/powerpc/lpar-console.patch
+ bugfix/all/sata_mv-clear_irq.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
-+ features/arm/led-pca9532-mem-leak.patch
-+ features/arm/led-pca9532-workqueque.patch
+#+ features/arm/led-pca9532-mem-leak.patch
+#+ features/arm/led-pca9532-workqueque.patch
+ features/sparc/video-sunxvr500-intergraph.patch
-+ bugfix/all/stable/patch-2.6.28.1
-+ bugfix/all/stable/patch-2.6.28.2
-+ bugfix/all/stable/patch-2.6.28.3
-+ bugfix/all/stable/patch-2.6.28.4
-+ bugfix/all/stable/patch-2.6.28.5
-+ bugfix/all/stable/patch-2.6.28.6
Copied: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra (from r12853, /dists/trunk/linux-2.6/debian/patches/series/1-extra)
==============================================================================
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 Thu Feb 19 13:50:11 2009
@@ -1,12 +1,9 @@
-+ debian/dfsg/drivers-net-tg3-mark.patch
X debian/dfsg/files-1
-+ debian/dfsg/drivers-net-acenic-remove.patch
+ debian/dfsg/drivers-net-bnx2-disable.patch
+ debian/dfsg/drivers-net-bnx2x-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
+ debian/dfsg/drivers-net-hamradio-yam.patch
+ debian/dfsg/drivers-net-myri.patch
-+ debian/dfsg/drivers-net-tg3-remove.patch
+ debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
+ debian/dfsg/drivers-scsi-qlogicpti.patch
+ debian/dfsg/firmware-cleanup.patch
More information about the Kernel-svn-changes
mailing list