update to patch-2.6.24-git6
triple wow that is a huge commit ext4, net, mips, .. nuke in patch-2.6.24-git6 ref to smctr and bnx2_fw (this will make porting next git patch less fun too) also it seems that that another broadcom driver adds yet another firmware.. on the good news side nuke our older ath5k and at76 backports! apply the git patch first to get a change to see what conflicts later. big forward porting of scripts-kconfig-reportoldconfig.patch arm disabling of ath5k no longer applies, disabled for now. svn path=/dists/trunk/linux-2.6/; revision=10258
This commit is contained in:
parent
28b729414e
commit
7197a5a735
File diff suppressed because it is too large
Load Diff
|
@ -11,7 +11,7 @@ index e6499db..c16974c 100644
|
|||
|
||||
Kconfig := arch/$(SRCARCH)/Kconfig
|
||||
|
||||
@@ -20,9 +20,15 @@ config: $(obj)/conf
|
||||
@@ -21,9 +21,15 @@ config: $(obj)/conf
|
||||
oldconfig: $(obj)/conf
|
||||
$< -o $(Kconfig)
|
||||
|
||||
|
@ -24,22 +24,22 @@ index e6499db..c16974c 100644
|
|||
+updateoldconfig: $(obj)/conf
|
||||
+ $< -U $(Kconfig)
|
||||
+
|
||||
# Create new linux.po file
|
||||
# Create new linux.pot file
|
||||
# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
|
||||
# The symlink is used to repair a deficiency in arch/um
|
||||
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
|
||||
index 4dcb886..b5e1b25 100644
|
||||
--- a/scripts/kconfig/conf.c
|
||||
+++ b/scripts/kconfig/conf.c
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include <locale.h>
|
||||
#include <ctype.h>
|
||||
+#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -490,11 +491,100 @@ static void check_conf(struct menu *menu
|
||||
@@ -494,11 +495,100 @@ static void check_conf(struct menu *menu
|
||||
check_conf(child);
|
||||
}
|
||||
|
||||
|
@ -133,16 +133,16 @@ index 4dcb886..b5e1b25 100644
|
|||
+
|
||||
int main(int ac, char **av)
|
||||
{
|
||||
int i = 1;
|
||||
int opt;
|
||||
const char *name;
|
||||
struct stat tmpstat;
|
||||
+ bool report = false, update = false;
|
||||
|
||||
if (ac > i && av[i][0] == '-') {
|
||||
switch (av[i++][1]) {
|
||||
@@ -530,6 +620,14 @@ int main(int ac, char **av)
|
||||
setlocale(LC_ALL, "");
|
||||
bindtextdomain(PACKAGE, LOCALEDIR);
|
||||
@@ -533,6 +623,14 @@ int main(int ac, char **av)
|
||||
input_mode = set_random;
|
||||
srandom(time(NULL));
|
||||
srand(time(NULL));
|
||||
break;
|
||||
+ case 'R':
|
||||
+ input_mode = set_default;
|
||||
|
@ -153,18 +153,18 @@ index 4dcb886..b5e1b25 100644
|
|||
+ update = true;
|
||||
+ break;
|
||||
case 'h':
|
||||
case '?':
|
||||
fprintf(stderr, "See README for usage info\n");
|
||||
@@ -545,13 +643,17 @@ int main(int ac, char **av)
|
||||
printf(_("See README for usage info\n"));
|
||||
exit(0);
|
||||
@@ -551,13 +649,17 @@ int main(int ac, char **av)
|
||||
//zconfdump(stdout);
|
||||
switch (input_mode) {
|
||||
case set_default:
|
||||
- if (!defconfig_file)
|
||||
- defconfig_file = conf_get_default_confname();
|
||||
- if (conf_read(defconfig_file)) {
|
||||
- printf("***\n"
|
||||
- printf(_("***\n"
|
||||
- "*** Can't find default configuration \"%s\"!\n"
|
||||
- "***\n", defconfig_file);
|
||||
- "***\n"), defconfig_file);
|
||||
- exit(1);
|
||||
+ if (update)
|
||||
+ conf_read(NULL);
|
||||
|
@ -180,7 +180,7 @@ index 4dcb886..b5e1b25 100644
|
|||
}
|
||||
break;
|
||||
case ask_silent:
|
||||
@@ -613,6 +715,10 @@ int main(int ac, char **av)
|
||||
@@ -620,6 +722,10 @@ int main(int ac, char **av)
|
||||
conf_cnt = 0;
|
||||
check_conf(&rootmenu);
|
||||
} while (conf_cnt);
|
||||
|
@ -241,7 +241,7 @@ index ee225ce..f8a31ee 100644
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <regex.h>
|
||||
@@ -206,7 +207,7 @@ static void sym_calc_visibility(struct s
|
||||
@@ -201,7 +202,7 @@ static void sym_calc_visibility(struct s
|
||||
tri = yes;
|
||||
if (sym->visible != tri) {
|
||||
sym->visible = tri;
|
||||
|
@ -250,7 +250,7 @@ index ee225ce..f8a31ee 100644
|
|||
}
|
||||
if (sym_is_choice_value(sym))
|
||||
return;
|
||||
@@ -217,7 +218,7 @@ static void sym_calc_visibility(struct s
|
||||
@@ -212,7 +213,7 @@ static void sym_calc_visibility(struct s
|
||||
tri = yes;
|
||||
if (sym->rev_dep.tri != tri) {
|
||||
sym->rev_dep.tri = tri;
|
||||
|
@ -259,7 +259,7 @@ index ee225ce..f8a31ee 100644
|
|||
}
|
||||
}
|
||||
|
||||
@@ -354,7 +355,7 @@ void sym_calc_value(struct symbol *sym)
|
||||
@@ -351,7 +352,7 @@ void sym_calc_value(struct symbol *sym)
|
||||
sym_validate_range(sym);
|
||||
|
||||
if (memcmp(&oldval, &sym->curr, sizeof(oldval))) {
|
||||
|
@ -268,12 +268,12 @@ index ee225ce..f8a31ee 100644
|
|||
if (modules_sym == sym) {
|
||||
sym_set_all_changed();
|
||||
modules_val = modules_sym->curr.tri;
|
||||
@@ -367,7 +368,7 @@ void sym_calc_value(struct symbol *sym)
|
||||
for (e = prop->expr; e; e = e->left.expr) {
|
||||
e->right.sym->flags |= flags;
|
||||
@@ -366,7 +367,7 @@ void sym_calc_value(struct symbol *sym)
|
||||
expr_list_for_each_sym(prop->expr, e, choice_sym) {
|
||||
choice_sym->flags |= flags;
|
||||
if (flags & SYMBOL_CHANGED)
|
||||
- sym_set_changed(e->right.sym);
|
||||
+ sym_set_changed(e->right.sym, false);
|
||||
- sym_set_changed(choice_sym);
|
||||
+ sym_set_changed(choice_sym, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,3 +1,4 @@
|
|||
+ bugfix/all/patch-2.6.24-git6
|
||||
+ debian/version.patch
|
||||
+ debian/kernelvariables.patch
|
||||
+ debian/doc-build-parallel.patch
|
||||
|
@ -33,11 +34,8 @@
|
|||
+ bugfix/arm/disable-scsi_acard.patch
|
||||
+ bugfix/all/git-ieee1394.patch
|
||||
+ bugfix/all/fw-ohci-dyn-buffers-dma-descriptors.patch
|
||||
+ features/at76.patch
|
||||
+ features/ath5k.patch
|
||||
+ bugfix/arm/disable-ath5k.patch
|
||||
#+ bugfix/arm/disable-ath5k.patch
|
||||
+ bugfix/all/fw-sbp2-incr-login-orb-reply-timeout.patch
|
||||
+ bugfix/all/fw-sbp2-skip-unnecessary-logout.patch
|
||||
+ bugfix/all/fw-sbp2-try-increase-reconnect_hold.patch
|
||||
+ bugfix/all/patch-2.6.24-git5
|
||||
+ bugfix/all/ppc-vio_find_name-compile_fix.patch
|
||||
|
|
Loading…
Reference in New Issue