Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: introduce ccflags-y, asflags-y and ldflags-y
  kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
  kbuild: enable use of AFLAGS and CFLAGS on commandline
  kbuild: enable 'make AFLAGS=...' to add additional options to AS
  kbuild: fix AFLAGS use in h8300 and m68knommu
  kbuild: check for wrong use of CFLAGS
  kbuild: enable 'make CFLAGS=...' to add additional options to CC
  kbuild: fix up CFLAGS usage
  kbuild: make modpost detect unterminated device id lists
  kbuild: call export_report from the Makefile
  kbuild: move Kai Germaschewski to CREDITS
  kconfig/menuconfig: distinguish between selected-by-another options and comments
  kconfig: tristate choices with mixed tristate and boolean values
  include/linux/Kbuild: remove duplicate entries
  kbuild: kill backward compatibility checks
  kbuild: kill EXTRA_ARFLAGS
  kbuild: fix documentation in makefiles.txt
  kbuild: call make once for all targets when O=.. is used
  kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
  kbuild: update _shipped files for kconfig syntax cleanup
  ...

Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.

1 files changed, 26 insertions, 10 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index bc5854ed6055..47e226fdedd7 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -35,9 +35,13 @@ static const char mconf_readme[] = N_(
 "kernel parameters which are not really features, but must be\n"
 "entered in as decimal or hexadecimal numbers or possibly text.\n"
 "\n"
-"Menu items beginning with [*], <M> or [ ] represent features\n"
-"configured to be built in, modularized or removed respectively.\n"
-"Pointed brackets <> represent module capable features.\n"
+"Menu items beginning with following braces represent features that\n"
+"  [ ] can be built in or removed\n"
+"  < > can be built in, modularized or removed\n"
+"  { } can be built in or modularized (selected by other feature)\n"
+"  - - are selected by other feature,\n"
+"while *, M or whitespace inside braces means to build in, build as\n"
+"a module or to exclude the feature respectively.\n"
 "\n"
 "To change any of these features, highlight it with the cursor\n"
 "keys and press <Y> to build it in, <M> to make it a module or\n"
@@ -357,8 +361,9 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym)
         bool hit;
         struct property *prop;
 
-        str_printf(r, "Symbol: %s [=%s]\n", sym->name,
-                                       sym_get_string_value(sym));
+        if (sym && sym->name)
+                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+                                                    sym_get_string_value(sym));
         for_all_prompts(sym, prop)
                 get_prompt_str(r, prop);
         hit = false;
@@ -481,6 +486,14 @@ static void build_conf(struct menu *menu)
                                 if (single_menu_mode && menu->data)
                                         goto conf_childs;
                                 return;
+                        case P_COMMENT:
+                                if (prompt) {
+                                        child_count++;
+                                        item_make("   %*c*** %s ***", indent + 1, ' ', prompt);
+                                        item_set_tag(':');
+                                        item_set_data(menu);
+                                }
+                                break;
                         default:
                                 if (prompt) {
                                         child_count++;
@@ -560,7 +573,7 @@ static void build_conf(struct menu *menu)
                                 if (sym_is_changable(sym))
                                         item_make("[%c]", val == no ? ' ' : '*');
                                 else
-                                        item_make("---");
+                                        item_make("-%c-", val == no ? ' ' : '*');
                                 item_set_tag('t');
                                 item_set_data(menu);
                                 break;
@@ -570,10 +583,13 @@ static void build_conf(struct menu *menu)
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
-                                if (sym_is_changable(sym))
-                                        item_make("<%c>", ch);
-                                else
-                                        item_make("---");
+                                if (sym_is_changable(sym)) {
+                                        if (sym->rev_dep.tri == mod)
+                                                item_make("{%c}", ch);
+                                        else
+                                                item_make("<%c>", ch);
+                                } else
+                                        item_make("-%c-", ch);
                                 item_set_tag('t');
                                 item_set_data(menu);
                                 break;