[kernel] r17897 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/all/stable patches/bugfix/powerpc patches/features/all patches/features/all/xen patches/series
Ben Hutchings
benh at alioth.debian.org
Tue Aug 9 00:16:17 UTC 2011
Author: benh
Date: Tue Aug 9 00:16:15 2011
New Revision: 17897
Log:
Update to 3.1-rc1
Remove and refresh patches as necessary.
Disable aufs; after fixing textual conflicts it turns out to be broken by
a VFS change.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/ALSA-hda-Enable-auto-parser-as-default-for-Conexant-.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ALSA-hda-Handle-1-as-invalid-position-too.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ALSA-hda-Judge-playback-stream-from-stream-id-in-azx.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/Add-KEY_MICMUTE-and-enable-it-on-Lenovo-X220.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/m68k-atari-Reserve-some-ST-RAM-early-on-for-device-b.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/resources-Add-lookup_resource.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/3.0.1.patch
dists/trunk/linux-2.6/debian/patches/features/all/xen/backend-autoload.patch
dists/trunk/linux-2.6/debian/patches/series/2
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
dists/trunk/linux-2.6/debian/patches/features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Mon Aug 8 22:39:25 2011 (r17896)
+++ dists/trunk/linux-2.6/debian/changelog Tue Aug 9 00:16:15 2011 (r17897)
@@ -1,4 +1,6 @@
-linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
+linux-2.6 (3.1.0~rc1-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
[ Aurelien Jarno ]
* Add configuration files for s390x architecture.
@@ -10,10 +12,7 @@
(Closes: #636854):
- Various drivers replaced as for x86 in 2.6.32-10
- pata_macio replaces ide_pmac
-
- [ maximilian attems ]
- * Add stable 3.0.1 including:
- - [SCSI] fix crash in scsi_dispatch_cmd()
+ * aufs: Disable until it is updated for Linux 3.1
[ Jonathan Nieder ]
* perf: do not look at ./config for configuration (Closes: #632923)
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch Mon Aug 8 22:39:25 2011 (r17896)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch Tue Aug 9 00:16:15 2011 (r17897)
@@ -23,7 +23,7 @@
---
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
-@@ -511,14 +511,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
+@@ -536,13 +536,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
(unsigned long long) start << SECTOR_SHIFT);
/*
@@ -34,14 +34,14 @@
+ * violating it, so limit max_phys_segments to 1 lying within
+ * a single page.
*/
-+ if (q->merge_bvec_fn && !ti->type->merge) {
+- if (dm_queue_merge_is_compulsory(q) && !ti->type->merge)
+- blk_limits_max_hw_sectors(limits,
+- (unsigned int) (PAGE_SIZE >> 9));
++ if (dm_queue_merge_is_compulsory(q) && !ti->type->merge) {
+ limits->max_segments = 1;
+ limits->seg_boundary_mask = PAGE_CACHE_SIZE - 1;
+ }
-
-- if (q->merge_bvec_fn && !ti->type->merge)
-- blk_limits_max_hw_sectors(limits,
-- (unsigned int) (PAGE_SIZE >> 9));
++
return 0;
}
EXPORT_SYMBOL_GPL(dm_set_device_limits);
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch Mon Aug 8 22:39:25 2011 (r17896)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch Tue Aug 9 00:16:15 2011 (r17897)
@@ -1,39 +1,15 @@
-diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
-index 9235c46..8a20452 100644
---- a/arch/powerpc/platforms/pseries/lpar.c
-+++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -204,6 +204,7 @@ void __init find_udbg_vterm(void)
- struct device_node *stdout_node;
- const u32 *termno;
- const char *name;
-+ int add_console;
-
- /* find the boot console from /chosen/stdout */
- if (!of_chosen)
-@@ -219,6 +220,8 @@ void __init find_udbg_vterm(void)
- printk(KERN_WARNING "stdout node missing 'name' property!\n");
+diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
+index 130aace..028349a 100644
+--- a/drivers/tty/hvc/hvc_vio.c
++++ b/drivers/tty/hvc/hvc_vio.c
+@@ -446,7 +446,9 @@ void __init hvc_vio_init_early(void)
+ if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
goto out;
- }
-+ /* The user has requested a console so this is already set up. */
-+ add_console = !strstr(cmd_line, "console=");
-
- /* Check if it's a virtual terminal */
- if (strncmp(name, "vty", 3) != 0)
-@@ -232,13 +235,15 @@ void __init find_udbg_vterm(void)
- udbg_putc = udbg_putcLP;
- udbg_getc = udbg_getcLP;
- udbg_getc_poll = udbg_getc_pollLP;
-- add_preferred_console("hvc", termno[0] & 0xff, NULL);
-+ if (add_console)
-+ add_preferred_console("hvc", termno[0] & 0xff, NULL);
- } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
- vtermno = termno[0];
- udbg_putc = udbg_hvsi_putc;
- udbg_getc = udbg_hvsi_getc;
- udbg_getc_poll = udbg_hvsi_getc_poll;
-- add_preferred_console("hvsi", termno[0] & 0xff, NULL);
-+ if (add_console)
-+ add_preferred_console("hvsi", termno[0] & 0xff, NULL);
- }
+ #endif
+- add_preferred_console("hvc", 0, NULL);
++ /* Check whether the user has requested a different console. */
++ if (!strstr(cmd_line, "console="))
++ add_preferred_console("hvc", 0, NULL);
+ hvc_instantiate(0, 0, ops);
out:
of_node_put(stdout_node);
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 Mon Aug 8 22:39:25 2011 (r17896)
+++ dists/trunk/linux-2.6/debian/patches/features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch Tue Aug 9 00:16:15 2011 (r17897)
@@ -1,4 +1,4 @@
-From 05bf283675db983cab59159db8fb82b9a2858c7f Mon Sep 17 00:00:00 2001
+From 9ea05ef9d1e272f17808838510f886d3138845b8 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Tue, 14 Sep 2010 04:33:34 +0100
Subject: [PATCH] Kbuild: kconfig: Verbose version of --listnewconfig
@@ -12,17 +12,17 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
- scripts/kconfig/conf.c | 45 +++++++++++++++++++++++++++++++++---------
- scripts/kconfig/confdata.c | 5 ++-
- scripts/kconfig/expr.h | 2 +
+ scripts/kconfig/conf.c | 42 ++++++++++++++++++++++++++++++++----------
+ scripts/kconfig/confdata.c | 9 +++++++++
+ scripts/kconfig/expr.h | 2 ++
scripts/kconfig/lkc_proto.h | 1 +
- 4 files changed, 41 insertions(+), 12 deletions(-)
+ 4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 5459a38..f4752b4 100644
+index f208f90..ffaa787 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
-@@ -363,7 +363,6 @@ static void conf(struct menu *menu)
+@@ -364,7 +364,6 @@ static void conf(struct menu *menu)
switch (prop->type) {
case P_MENU:
if ((input_mode == silentoldconfig ||
@@ -30,7 +30,7 @@
input_mode == oldnoconfig) &&
rootEntry != menu) {
check_conf(menu);
-@@ -423,11 +422,7 @@ static void check_conf(struct menu *menu)
+@@ -425,11 +424,7 @@ static void check_conf(struct menu *menu)
if (sym && !sym_has_value(sym)) {
if (sym_is_changable(sym) ||
(sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
@@ -43,7 +43,7 @@
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
-@@ -440,6 +435,33 @@ static void check_conf(struct menu *menu)
+@@ -442,6 +437,30 @@ static void check_conf(struct menu *menu)
check_conf(child);
}
@@ -64,10 +64,7 @@
+ sym = menu->sym;
+ if (sym && (sym->flags & SYMBOL_NEW) &&
+ sym_is_changable(sym) && sym->name && !sym_is_choice_value(sym)) {
-+ if (verbose)
-+ conf_write_symbol(sym, stdout, true);
-+ else
-+ printf("CONFIG_%s\n", sym->name);
++ conf_write_new_symbol(stdout, sym, verbose);
+ }
+
+ for (child = menu->list; child; child = child->next)
@@ -77,15 +74,15 @@
static struct option long_opts[] = {
{"oldaskconfig", no_argument, NULL, oldaskconfig},
{"oldconfig", no_argument, NULL, oldconfig},
-@@ -460,6 +482,7 @@ int main(int ac, char **av)
- {
+@@ -482,6 +501,7 @@ int main(int ac, char **av)
+ const char *progname = av[0];
int opt;
- const char *name;
+ const char *name, *defconfig_file = NULL /* gcc uninit */;
+ const char *value;
struct stat tmpstat;
setlocale(LC_ALL, "");
-@@ -604,16 +627,18 @@ int main(int ac, char **av)
+@@ -634,16 +654,18 @@ int main(int ac, char **av)
input_mode = silentoldconfig;
/* fall through */
case oldconfig:
@@ -109,19 +106,25 @@
}
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
-index c06f150..fbbacac 100644
+index 59b667c..d2be252 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
-@@ -440,7 +440,7 @@ static void conf_write_string(bool headerfile, const char *name,
- fputs("\"\n", out);
+@@ -695,6 +695,14 @@ next_menu:
+ return 0;
}
--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)
++void conf_write_new_symbol(FILE *fp, struct symbol *sym, bool verbose)
++{
++ if (verbose)
++ conf_write_symbol(fp, sym, &kconfig_printer_cb, NULL);
++ else
++ fprintf(fp, "%s%s\n", CONFIG_, sym->name);
++}
++
+ int conf_write(const char *name)
{
- const char *str;
-
-@@ -1009,6 +1009,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
+ FILE *out;
+@@ -1079,6 +1087,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
for_all_symbols(i, sym) {
if (sym_has_value(sym))
continue;
@@ -130,10 +133,10 @@
case S_BOOLEAN:
case S_TRISTATE:
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
-index 184eb6a..b267933 100644
+index 80fce57..0db77f3 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
-@@ -108,6 +108,8 @@ struct symbol {
+@@ -104,6 +104,8 @@ struct symbol {
#define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */
#define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */
@@ -143,17 +146,17 @@
#define SYMBOL_HASHSIZE 9973
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
-index 17342fe..6da571b 100644
+index 47fe9c3..dd0024a 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -7,6 +7,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_symbol, void,(struct symbol*, FILE*, bool));
++P(conf_write_new_symbol, void,(FILE*, struct symbol*, 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)));
--
-1.7.2.3
+1.7.5.4
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Mon Aug 8 22:39:25 2011 (r17896)
+++ dists/trunk/linux-2.6/debian/patches/series/base Tue Aug 9 00:16:15 2011 (r17897)
@@ -8,12 +8,12 @@
# Patches and source files from aufs2 repository, imported with
# debian/patches/features/all/aufs2/gen-patch.
-+ features/all/aufs2/aufs2-base.patch
-+ features/all/aufs2/aufs2-standalone.patch
-+ features/all/aufs2/aufs2-kbuild.patch
-+ features/all/aufs2/aufs2-add.patch
+#+ features/all/aufs2/aufs2-base.patch
+#+ features/all/aufs2/aufs2-standalone.patch
+#+ features/all/aufs2/aufs2-kbuild.patch
+#+ features/all/aufs2/aufs2-add.patch
# mark as staging/crap
-+ features/all/aufs2/mark-as-staging.patch
+#+ features/all/aufs2/mark-as-staging.patch
+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
@@ -40,11 +40,4 @@
+ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
+ debian/cgroups-Document-the-Debian-memory-resource-controll.patch
+ bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
-+ features/all/rt2x00-Add-device-ID-for-RT539F-device.patch
-+ bugfix/all/Add-KEY_MICMUTE-and-enable-it-on-Lenovo-X220.patch
-+ bugfix/all/resources-Add-lookup_resource.patch
-+ bugfix/all/m68k-atari-Reserve-some-ST-RAM-early-on-for-device-b.patch
-+ bugfix/all/ALSA-hda-Handle-1-as-invalid-position-too.patch
-+ bugfix/all/ALSA-hda-Judge-playback-stream-from-stream-id-in-azx.patch
-+ bugfix/all/ALSA-hda-Enable-auto-parser-as-default-for-Conexant-.patch
-+ features/all/xen/backend-autoload.patch
++ bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch
More information about the Kernel-svn-changes
mailing list