Merge branch 'message-callback' into kbuild/kconfig

Conflicts:
	scripts/kconfig/nconf.c

diff --cc scripts/kconfig/confdata.c
Simple merge

diff --cc scripts/kconfig/lkc_proto.h
Simple merge

diff --cc scripts/kconfig/nconf.c
index a2969fdc66b4a9a3c4679e59a98dbe99feb65b34,16233a9382c85e958891d121599ae2b850217325..272a987f23e0bc56040c0931a363277395c511f1
--- 1/scripts/kconfig/nconf.c
--- 2/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@@ -693,24 -680,12 +673,10 @@@ static int do_exit(void
                if (res)
                        btn_dialog(
                                main_window,
 -                              _("Error during writing of the kernel "
 -                                "configuration.\n"
 -                                "Your kernel configuration "
 -                                "changes were NOT saved."),
 +                              _("Error during writing of configuration.\n"
 +                                "Your configuration changes were NOT saved."),
                                  1,
                                  "<OK>");
-               else {
-                       char buf[1024];
-                       snprintf(buf, 1024,
-                               _("Configuration written to %s\n"
-                                 "End of the configuration.\n"
-                                 "Execute 'make' to start the build or try"
-                                 " 'make help'."), filename);
-                       btn_dialog(
-                               main_window,
-                               buf,
-                               1,
-                               "<OK>");
-               }
                break;
        default:
                btn_dialog(