[kernel] r16272 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/all/stable patches/bugfix/ia64 patches/bugfix/mips patches/debian patches/debian/dfsg patches/features/all patches/features/all/speakup patches/features/arm patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Sep 13 01:37:43 UTC 2010
Author: benh
Date: Mon Sep 13 01:37:29 2010
New Revision: 16272
Log:
New upstream release candidate 2.6.36-rc4
Remove patches merged upstream.
Rewrite debian/scripts-kconfig-reportoldconfig.patch
Rewrite bugfix/mips/disable-werror.patch as debian/mips-disable-werror.patch
Refresh some other patches.
Added:
dists/trunk/linux-2.6/debian/patches/debian/mips-disable-werror.patch
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/3c59x-Fix-call-to-mdio_sync-with-the-wrong-argument.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ipv6-Clamp-reported-valid_lft-to-a-minimum-of-0.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ipv6-Use-interface-max_desync_factor.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/mantis-Select-correct-frontends.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/mm-fix-page-table-unmap-for-stack-guard-page-properl.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/mm-fix-up-some-user-visible-effects-of-the-stack-gua.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/netfilter-fix-CONFIG_COMPAT-support.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/rtl8192su-Clean-up-in-case-of-an-error-in-mo.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/rtl8192su-Fix-procfs-code-for-interfaces-not.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.35.1.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.35.2.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.35.3.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.35.4.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Depends-on-X86.patch
dists/trunk/linux-2.6/debian/patches/bugfix/mips/disable-werror.patch
dists/trunk/linux-2.6/debian/patches/bugfix/mips/octeon-gcc-4.4.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/lgs8gxx-lgs8g75-disable.patch
dists/trunk/linux-2.6/debian/patches/features/all/lgs8gxx-lgs8g75-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/m25p80-add-support-mx25l8005.patch
dists/trunk/linux-2.6/debian/patches/features/arm/hp-t5325.patch
dists/trunk/linux-2.6/debian/patches/features/arm/openrd-ultimate.patch
dists/trunk/linux-2.6/debian/patches/features/arm/ts219-mpp44.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
dists/trunk/linux-2.6/debian/patches/series/1~experimental.3
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
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/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 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/changelog Mon Sep 13 01:37:29 2010 (r16272)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.36~rc4-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 13 Sep 2010 01:25:14 +0100
+
linux-2.6 (2.6.35-1~experimental.3) experimental; urgency=low
[ Ritesh Raj Sarraf ]
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch Mon Sep 13 01:37:29 2010 (r16272)
@@ -4,7 +4,7 @@
+++ b/arch/ia64/Makefile
@@ -30,16 +30,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
-falign-functions=32 -frename-registers -fno-optimize-sibling-calls
- CFLAGS_KERNEL := -mconstant-gp
+ KBUILD_CFLAGS_KERNEL := -mconstant-gp
-GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
-KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Mon Sep 13 01:37:29 2010 (r16272)
@@ -37,8 +37,6 @@
rm drivers/media/dvb/dvb-usb/af9005-script.h
-unifdef drivers/media/dvb/frontends/lgs8gxx.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 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Mon Sep 13 01:37:29 2010 (r16272)
@@ -28,7 +28,7 @@
-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.4.0.bin \
+- cxgb3/t3fw-7.10.0.bin \
- cxgb3/ael2005_opt_edc.bin \
- cxgb3/ael2005_twx_edc.bin \
- cxgb3/ael2020_twx_edc.bin
Added: dists/trunk/linux-2.6/debian/patches/debian/mips-disable-werror.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/mips-disable-werror.patch Mon Sep 13 01:37:29 2010 (r16272)
@@ -0,0 +1,28 @@
+From 210ea66fdb876415c09d20497beed650ac65e9d2 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 13 Sep 2010 02:16:18 +0100
+Subject: [PATCH] Partially revert "MIPS: Add -Werror to arch/mips/Kbuild"
+
+This reverts commit 66f9ba101f54bda63ab1db97f9e9e94763d0651b.
+
+We really don't want to add -Werror anywhere.
+---
+ arch/mips/Kbuild | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild
+index e322d65..2e6b28f 100644
+--- a/arch/mips/Kbuild
++++ b/arch/mips/Kbuild
+@@ -1,8 +1,3 @@
+-# Fail on warnings - also for files referenced in subdirs
+-# -Werror can be disabled for specific files using:
+-# CFLAGS_<file.o> := -Wno-error
+-subdir-ccflags-y := -Werror
+-
+ # platform specific definitions
+ include arch/mips/Kbuild.platforms
+ obj-y := $(platform-y)
+--
+1.7.1
+
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 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Mon Sep 13 01:37:29 2010 (r16272)
@@ -1,5 +1,5 @@
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index 999e8a7..3b5d4ba 100644
+index de934de..57e96aa 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -3,7 +3,7 @@
@@ -11,105 +11,78 @@
ifdef KBUILD_KCONFIG
Kconfig := $(KBUILD_KCONFIG)
-@@ -26,10 +26,16 @@ config: $(obj)/conf
+@@ -29,10 +29,16 @@ nconfig: $(obj)/nconf
oldconfig: $(obj)/conf
- $< -o $(Kconfig)
+ $< --$@ $(Kconfig)
+reportoldconfig: $(obj)/conf
-+ $< -R $(Kconfig)
++ $< --$@ $(Kconfig)
+
silentoldconfig: $(obj)/conf
$(Q)mkdir -p include/generated
- $< -s $(Kconfig)
+ $< --$@ $(Kconfig)
+updateoldconfig: $(obj)/conf
-+ $< -U $(Kconfig)
++ $< --$@ $(Kconfig)
+
# if no path is given, then use src directory to find file
ifdef LSMOD
LSMOD_F := $(LSMOD)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 3e1057f..e526d00 100644
+index 5b7c86e..9c2171c 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
-@@ -5,6 +5,7 @@
+@@ -33,6 +33,8 @@ enum input_mode {
+ savedefconfig,
+ listnewconfig,
+ oldnoconfig,
++ reportoldconfig,
++ updateoldconfig,
+ } input_mode = oldaskconfig;
+
+ char *defconfig_file;
+@@ -453,6 +455,8 @@ static struct option long_opts[] = {
+ {"randconfig", no_argument, NULL, randconfig},
+ {"listnewconfig", no_argument, NULL, listnewconfig},
+ {"oldnoconfig", no_argument, NULL, oldnoconfig},
++ {"reportoldconfig", no_argument, NULL, reportoldconfig},
++ {"updateoldconfig", no_argument, NULL, updateoldconfig},
+ {NULL, 0, NULL, 0}
+ };
- #include <locale.h>
- #include <ctype.h>
-+#include <stdbool.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -434,12 +435,13 @@ int main(int ac, char **av)
- int opt;
- const char *name;
- struct stat tmpstat;
-+ bool report = false, update = false;
-
- setlocale(LC_ALL, "");
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
-
-- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
-+ while ((opt = getopt(ac, av, "osdD:nmyrRUh")) != -1) {
- switch (opt) {
- case 'o':
- input_mode = ask_silent;
-@@ -481,6 +482,14 @@ int main(int ac, char **av)
- input_mode = set_random;
- break;
- }
-+ case 'R':
-+ input_mode = set_default;
-+ report = update = true;
-+ break;
-+ case 'U':
-+ input_mode = set_default;
-+ update = true;
-+ break;
- case 'h':
- printf(_("See README for usage info\n"));
- exit(0);
-@@ -512,13 +522,17 @@ int main(int ac, char **av)
-
- switch (input_mode) {
- case set_default:
-- if (!defconfig_file)
-- defconfig_file = conf_get_default_confname();
-- if (conf_read(defconfig_file)) {
-- printf(_("***\n"
-- "*** Can't find default configuration \"%s\"!\n"
-- "***\n"), defconfig_file);
-- exit(1);
-+ if (update)
-+ conf_read(NULL);
-+ else {
-+ if (!defconfig_file)
-+ defconfig_file = conf_get_default_confname();
-+ if (conf_read(defconfig_file)) {
-+ printf("***\n"
-+ "*** Can't find default configuration \"%s\"!\n"
-+ "***\n", defconfig_file);
-+ exit(1);
-+ }
+@@ -530,6 +534,8 @@ int main(int ac, char **av)
}
break;
- case ask_silent:
-@@ -594,6 +608,9 @@ int main(int ac, char **av)
+ case savedefconfig:
++ case reportoldconfig:
++ case updateoldconfig:
+ conf_read(NULL);
+ break;
+ case silentoldconfig:
+@@ -595,6 +601,8 @@ int main(int ac, char **av)
+ conf_set_all_new_symbols(def_random);
+ break;
+ case defconfig:
++ case reportoldconfig:
++ case updateoldconfig:
+ conf_set_all_new_symbols(def_default);
+ break;
+ case savedefconfig:
+@@ -618,6 +626,9 @@ int main(int ac, char **av)
break;
}
-+ if (report)
++ if (input_mode == reportoldconfig)
+ conf_write_changes();
+
if (sync_kconfig) {
/* silentoldconfig is used during the build so we shall update autoconf.
* All other commands are only used to generate a config.
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
-index 830d9ea..faf0b50 100644
+index 515253f..ee81b42 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
-@@ -786,6 +786,85 @@ int conf_write_autoconf(void)
+@@ -893,6 +893,85 @@ int conf_write_autoconf(void)
return 0;
}
@@ -195,7 +168,7 @@
static int sym_change_count;
static void (*conf_changed_callback)(void);
-@@ -824,6 +903,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
+@@ -991,6 +1070,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
for_all_symbols(i, sym) {
if (sym_has_value(sym))
continue;
@@ -204,23 +177,23 @@
case S_BOOLEAN:
case S_TRISTATE:
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
-index 6408fef..fd025e1 100644
+index 6ee2e4f..09a6a7c 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
-@@ -106,6 +106,7 @@ struct symbol {
+@@ -107,6 +107,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_NEW 0x100000
#define SYMBOL_MAXLENGTH 256
- #define SYMBOL_HASHSIZE 257
+ #define SYMBOL_HASHSIZE 9973
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
-index 8e69461..974acf0 100644
+index 9a948c9..d5aeb72 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
-@@ -5,6 +5,7 @@ P(conf_read,int,(const char *name));
- P(conf_read_simple,int,(const char *name, int));
+@@ -6,6 +6,7 @@ P(conf_read_simple,int,(const char *name, int));
+ P(conf_write_defconfig,int,(const char *name));
P(conf_write,int,(const char *name));
P(conf_write_autoconf,int,(void));
+P(conf_write_changes,void,(void));
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 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Mon Sep 13 01:37:29 2010 (r16272)
@@ -3,10 +3,10 @@
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
-@@ -146,6 +146,8 @@
- source "drivers/staging/mrst-touchscreen/Kconfig"
+@@ -152,6 +152,8 @@
+ source "drivers/staging/tidspbridge/Kconfig"
- source "drivers/staging/msm/Kconfig"
+ source "drivers/staging/quickstart/Kconfig"
+
+source "drivers/staging/speakup/Kconfig"
@@ -14,10 +14,10 @@
endif # STAGING
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
-@@ -53,3 +53,4 @@
- obj-$(CONFIG_FB_XGI) += xgifb/
- obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH) += mrst-touchscreen/
- obj-$(CONFIG_MSM_STAGING) += msm/
+@@ -57,3 +57,4 @@
+ obj-$(CONFIG_SOLO6X10) += solo6x10/
+ obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/
+ obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/
+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 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/series/base Mon Sep 13 01:37:29 2010 (r16272)
@@ -7,7 +7,6 @@
+ features/all/drivers-media-dvb-usb-af9005-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
@@ -32,7 +31,7 @@
+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
+ bugfix/arm/disable-scsi_acard.patch
-+ bugfix/mips/disable-werror.patch
++ debian/mips-disable-werror.patch
+ bugfix/powerpc/lpar-console.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
@@ -45,16 +44,3 @@
+ bugfix/mips/mips-ide-flush-dcache.patch
#+ bugfix/all/thinkpad-acpi-fix-backlight.patch
+ features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
-+ bugfix/all/ipr-add-writeq-definition-if-needed.patch
-+ bugfix/all/mantis-Select-correct-frontends.patch
-+ features/arm/openrd-ultimate.patch
-+ features/arm/ts219-mpp44.patch
-+ features/arm/hp-t5325.patch
-+ features/all/m25p80-add-support-mx25l8005.patch
-+ bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch
-+ bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch
-+ bugfix/all/ipv6-Clamp-reported-valid_lft-to-a-minimum-of-0.patch
-+ bugfix/all/ipv6-Use-interface-max_desync_factor.patch
-+ bugfix/all/rtl8192su-Clean-up-in-case-of-an-error-in-mo.patch
-+ bugfix/all/rtl8192su-Fix-procfs-code-for-interfaces-not.patch
-+ bugfix/all/viafb-Depends-on-X86.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Sun Sep 12 23:07:28 2010 (r16271)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Mon Sep 13 01:37:29 2010 (r16272)
@@ -6,7 +6,6 @@
+ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
+ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
+ debian/dfsg/firmware-cleanup.patch
-+ debian/dfsg/lgs8gxx-lgs8g75-disable.patch
+ debian/dfsg/r8169-rtl8168d-1-2-disable.patch
+ debian/dfsg/sound-pci.patch
X debian/dfsg/files-1
More information about the Kernel-svn-changes
mailing list