Merge 4.16-rc6 into tty-next

We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 5c12dc91ef34..df26c7b0fe13 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -178,7 +178,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
         case S_HEX:
         done:
                 if (sym_string_valid(sym, p)) {
-                        sym->def[def].val = strdup(p);
+                        sym->def[def].val = xstrdup(p);
                         sym->flags |= def_flags;
                 } else {
                         if (def != S_DEF_AUTO)