diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:37:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:37:39 +0200 |
| commit | e6aa640eb2f68920cb849aec0cab44f05d843238 (patch) | |
| tree | 42e07ee412112abe90d459f821e8d73c26cc648e /scripts/kconfig/confdata.c | |
| parent | 1f573cce48a2ebb35953034062ef01056b7d6a58 (diff) | |
| parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
| download | linux-e6aa640eb2f68920cb849aec0cab44f05d843238.tar.bz2 | |
Merge 5.3-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 1134892599da..3569d2dec37c 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -848,6 +848,7 @@ int conf_write(const char *name) const char *str; char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1]; char *env; + int i; bool need_newline = false; if (!name) @@ -930,6 +931,9 @@ next: } fclose(out); + for_all_symbols(i, sym) + sym->flags &= ~SYMBOL_WRITTEN; + if (*tmpname) { if (is_same(name, tmpname)) { conf_message("No change to %s", name); |