[kernel] r16606 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/arm patches/debian patches/debian/dfsg patches/features/all patches/features/all/speakup patches/features/x86 patches/series
Ben Hutchings
benh at alioth.debian.org
Sun Nov 28 04:14:56 UTC 2010
Author: benh
Date: Sun Nov 28 04:14:29 2010
New Revision: 16606
Log:
Update to 2.6.37-rc3
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/perf-Fix-detection-of-script-extension.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/staging-fix-Makefile-so-broadcom-driver-will-build.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/vivi-Don-t-depend-on-FONTS.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/kirkwood-restrict-pcie-reset.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
dists/trunk/linux-2.6/debian/patches/features/all/speakup/
dists/trunk/linux-2.6/debian/patches/features/all/staging-Add-initial-release-of-brcm80211.patch
dists/trunk/linux-2.6/debian/patches/features/x86/ata_piix-Add-device-ID-for-ICH4-L.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
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/kernelvariables.patch
dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.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 Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/changelog Sun Nov 28 04:14:29 2010 (r16606)
@@ -1,4 +1,6 @@
-linux-2.6 (2.6.36-1~experimental.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.37~rc3-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
[ maximilian attems ]
* Newer Standards-Version 3.9.1 without changes.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Sun Nov 28 04:14:29 2010 (r16606)
@@ -44,8 +44,6 @@
unifdef drivers/net/r8169.c -UREMOVE_DFSG
-rm drivers/staging/otus/hal/hp*fw*.c*
-
unifdef drivers/staging/rtl8192u/r819xU_firmware_img.c -UREMOVE_DFSG
rm drivers/staging/vt6656/firmware.c
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 Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Sun Nov 28 04:14:29 2010 (r16606)
@@ -2,7 +2,7 @@
index 1c00d05..3bf888d 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,53 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,55 +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.
@@ -18,12 +18,14 @@
- 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.13.0.fw bnx2x-e1h-5.2.13.0.fw
--fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j15.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_BNX2X) += bnx2x/bnx2x-e1-6.0.34.0.fw \
+- bnx2x/bnx2x-e1h-6.0.34.0.fw \
+- bnx2x/bnx2x-e2-6.0.34.0.fw
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.0.17.fw \
+- bnx2/bnx2-rv2p-09-6.0.17.fw \
+- bnx2/bnx2-rv2p-09ax-6.0.17.fw \
+- bnx2/bnx2-mips-06-6.0.15.fw \
+- bnx2/bnx2-rv2p-06-6.0.15.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 \
Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Sun Nov 28 04:14:29 2010 (r16606)
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -192,35 +192,6 @@
+@@ -192,38 +192,6 @@
CROSS_COMPILE ?=
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
@@ -17,6 +17,9 @@
-endif
-
-# Additional ARCH settings for sparc
+-ifeq ($(ARCH),sparc32)
+- SRCARCH := sparc
+-endif
-ifeq ($(ARCH),sparc64)
- SRCARCH := sparc
-endif
Modified: dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch Sun Nov 28 04:14:29 2010 (r16606)
@@ -1,7 +1,5 @@
-diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
-index 44203ff..964bab1 100644
---- a/drivers/char/sysrq.c
-+++ b/drivers/char/sysrq.c
+--- a/drivers/tty/sysrq.c
++++ b/drivers/tty/sysrq.c
@@ -43,7 +43,7 @@
#include <asm/irq_regs.h>
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/patches/series/base Sun Nov 28 04:14:29 2010 (r16606)
@@ -17,12 +17,6 @@
# 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/
-+ features/all/speakup/speakup-add.patch
-+ features/all/speakup/speakup-kbuild.patch
-+ features/all/speakup/speakup-fix-vc_tty.patch
-
+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
+ bugfix/arm/disable-scsi_acard.patch
@@ -36,17 +30,12 @@
+ debian/arch-sh4-fix-uimage-build.patch
-+ bugfix/mips/mips-ide-flush-dcache.patch
-
-+ features/all/staging-Add-initial-release-of-brcm80211.patch
-+ bugfix/all/staging-fix-Makefile-so-broadcom-driver-will-build.patch
-+ bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
++ debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
++ debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
++ debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch
-+ bugfix/all/vivi-Don-t-depend-on-FONTS.patch
++ bugfix/mips/mips-ide-flush-dcache.patch
+ bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
-+ bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
-+ bugfix/all/perf-Fix-detection-of-script-extension.patch
+ bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
-+ features/x86/ata_piix-Add-device-ID-for-ICH4-L.patch
-+ bugfix/arm/kirkwood-restrict-pcie-reset.patch
+ bugfix/arm/ixp4xx-add-missing-export.patch
++ features/arm/asoc-openrd-ultimate.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Sat Nov 27 23:07:10 2010 (r16605)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Sun Nov 28 04:14:29 2010 (r16606)
@@ -1,7 +1,6 @@
+ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
-+ debian/dfsg/drivers-staging-otus-disable.patch
+ debian/dfsg/rtl8192u_usb-Remove-built-in-firmware.patch
+ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
+ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
More information about the Kernel-svn-changes
mailing list