[kernel] r16898 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/arm patches/bugfix/sh4 patches/bugfix/sparc patches/debian patches/debian/dfsg patches/features/all patches/features/arm patches/series
Ben Hutchings
benh at alioth.debian.org
Wed Feb 16 13:39:17 UTC 2011
Author: benh
Date: Wed Feb 16 13:38:58 2011
New Revision: 16898
Log:
Update to 2.6.38-rc5
Adjust/remove patches as appropriate.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/btrfs-Require-CAP_SYS_ADMIN-for-filesystem-rebalance.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/i2c-i801-Include-linux-slab.h.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/r8169-keep-firmware-in-memory.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx-add-missing-export.patch
dists/trunk/linux-2.6/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch
dists/trunk/linux-2.6/debian/patches/bugfix/sparc/introduce-u64-aligned.patch
dists/trunk/linux-2.6/debian/patches/bugfix/sparc/tracing-use-u64-aligned-as-type-and-variable-attribute.patch
dists/trunk/linux-2.6/debian/patches/debian/alpha-Do-not-use-Werror-for-arch-alpha.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
dists/trunk/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch
dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Fix-external-firmware-loading.patch
dists/trunk/linux-2.6/debian/patches/features/arm/asoc-openrd-ultimate.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/features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Switch-driver-to-use-external-firmware.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 Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/changelog Wed Feb 16 13:38:58 2011 (r16898)
@@ -1,15 +1,17 @@
-linux-2.6 (2.6.37-1~experimental.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.38~rc5-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
+ - r8169: Keep firmware in memory (Closes: #609538)
+ - [sparc] Fix misaligned tracing information which the module loader
+ does not support (Closes: #609371)
+ - [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.
[ Ben Hutchings ]
* [arm] ixp4xx: Revert build fix, now applied upstream which resulted
in another build failure
- * r8169: Keep firmware in memory (Closes: #609538)
* r8712u: Firmware filename is rtlwifi/rtl8712u.bin (Closes: #602450)
- * [sparc] Fix misaligned tracing information which the module loader
- does not support (Closes: #609371)
[ Aurelien Jarno ]
- * [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.
* [mips/5kc-malta] Enable CONFIG_VGA_CONSOLE.
[ Bastian Blank ]
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Wed Feb 16 13:38:58 2011 (r16898)
@@ -43,10 +43,7 @@
rm drivers/net/appletalk/cops_ffdrv.h
rm drivers/net/appletalk/cops_ltdrv.h
-unifdef drivers/net/r8169.c -UREMOVE_DFSG
-
-# For next version
-#rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
+rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
rm drivers/staging/keucr/init.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 Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Wed Feb 16 13:38:58 2011 (r16898)
@@ -18,13 +18,13 @@
- adaptec/starfire_tx.bin
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.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 \
+-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.5.0.fw \
+- bnx2x/bnx2x-e1h-6.2.5.0.fw \
+- bnx2x/bnx2x-e2-6.2.5.0.fw
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1.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-mips-06-6.2.1.fw \
- bnx2/bnx2-rv2p-06-6.0.15.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Wed Feb 16 13:38:58 2011 (r16898)
@@ -37,8 +37,8 @@
-endif
-
KCONFIG_CONFIG ?= .config
+ export KCONFIG_CONFIG
- # SHELL used by kbuild
@@ -340,6 +311,36 @@ LDFLAGS_MODULE =
AFLAGS_KERNEL =
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
Modified: dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch Wed Feb 16 13:38:58 2011 (r16898)
@@ -1,14 +1,14 @@
---- a/drivers/tty/sysrq.c
-+++ b/drivers/tty/sysrq.c
-@@ -43,7 +43,7 @@
- #include <asm/irq_regs.h>
+--- a/include/linux/sysrq.h
++++ b/include/linux/sysrq.h
+@@ -18,7 +18,7 @@
+ #include <linux/types.h>
- /* Whether we react on sysrq keys or just ignore them */
--static int __read_mostly sysrq_enabled = 1;
-+static int __read_mostly sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_MASK;
- static bool __read_mostly sysrq_always_enabled;
+ /* Enable/disable SYSRQ support by default (0==no, 1==yes). */
+-#define SYSRQ_DEFAULT_ENABLE 1
++#define SYSRQ_DEFAULT_ENABLE CONFIG_MAGIC_SYSRQ_DEFAULT_MASK
- static bool sysrq_on(void)
+ /* Possible values of bitmask for enabling sysrq functions */
+ /* 0x0001 is reserved for enable everything */
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 234ceb1..415a834 100644
--- a/lib/Kconfig.debug
Modified: dists/trunk/linux-2.6/debian/patches/features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch Wed Feb 16 13:38:58 2011 (r16898)
@@ -65,7 +65,7 @@
+ if (sym && (sym->flags & SYMBOL_NEW) &&
+ sym_is_changable(sym) && sym->name && !sym_is_choice_value(sym)) {
+ if (verbose)
-+ conf_write_symbol(sym, sym->type, stdout, true);
++ conf_write_symbol(sym, stdout, true);
+ else
+ printf("CONFIG_%s\n", sym->name);
+ }
@@ -112,14 +112,12 @@
index c06f150..fbbacac 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
-@@ -440,8 +440,8 @@ static void conf_write_string(bool headerfile, const char *name,
+@@ -440,7 +440,7 @@ static void conf_write_string(bool headerfile, const char *name,
fputs("\"\n", out);
}
--static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
-- FILE *out, bool write_no)
-+void conf_write_symbol(struct symbol *sym, enum symbol_type type,
-+ FILE *out, bool write_no)
+-static void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no)
++void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no)
{
const char *str;
@@ -152,7 +150,7 @@
P(conf_write_defconfig,int,(const char *name));
P(conf_write,int,(const char *name));
P(conf_write_autoconf,int,(void));
-+P(conf_write_symbol, void,(struct symbol*, enum symbol_type, FILE*, bool));
++P(conf_write_symbol, void,(struct symbol*, FILE*, bool));
P(conf_get_changed,bool,(void));
P(conf_set_changed_callback, void,(void (*fn)(void)));
P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));
Modified: dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Switch-driver-to-use-external-firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Switch-driver-to-use-external-firmware.patch Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Switch-driver-to-use-external-firmware.patch Wed Feb 16 13:38:58 2011 (r16898)
@@ -3,6 +3,7 @@
Subject: [PATCH 1/2] staging: r8712u: Switch driver to use external firmware from linux-firmware
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+[bwh: Adjust context for 2.6.38]
---
drivers/staging/rtl8712/TODO | 2 --
drivers/staging/rtl8712/hal_init.c | 22 +++++++++++++++++-----
@@ -12,10 +13,10 @@
index 5c88821..ed22b0b 100644
--- a/drivers/staging/rtl8712/TODO
+++ b/drivers/staging/rtl8712/TODO
-@@ -4,8 +4,6 @@ TODO:
+@@ -4,7 +4,5 @@ TODO:
+ - switch to use LIB80211
- switch to use MAC80211
- checkpatch.pl fixes - only a few remain
- - sparse fixes
-- switch from large inline firmware file to use the firmware interface
- and add the file to the linux-firmware package.
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/series/base Wed Feb 16 13:38:58 2011 (r16898)
@@ -35,16 +35,7 @@
+ bugfix/mips/mips-ide-flush-dcache.patch
+ bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
+ bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
-+ bugfix/arm/ixp4xx-add-missing-export.patch
-+ features/arm/asoc-openrd-ultimate.patch
+ bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
+ features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
-
-+ bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch
-+ debian/alpha-Do-not-use-Werror-for-arch-alpha.patch
-+ bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch
-+ bugfix/all/i2c-i801-Include-linux-slab.h.patch
+ features/all/r8712u-Switch-driver-to-use-external-firmware.patch
-+ features/all/r8712u-Fix-external-firmware-loading.patch
-+ bugfix/all/btrfs-Require-CAP_SYS_ADMIN-for-filesystem-rebalance.patch
-+ features/all/r8169-remove-the-firmware-of-RTL8111D.patch
++ features/all/r8712u-Firmware-changes-for-driver.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Tue Feb 15 15:08:15 2011 (r16897)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Wed Feb 16 13:38:58 2011 (r16898)
@@ -5,7 +5,6 @@
+ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
+ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
+ debian/dfsg/firmware-cleanup.patch
-+ debian/dfsg/r8169-rtl8168d-1-2-disable.patch
+ debian/dfsg/sound-pci.patch
X debian/dfsg/files-1
+ debian/dfsg/firmware-Sierra-Wireless-CIS-copyright.patch
More information about the Kernel-svn-changes
mailing list