Merge commit '1591127c65683f00deedf4ecf9c2e5cf7d8fd45e'

chucklever · chucklever · commit e5785dd2bd11 · 2025-04-18T13:57:59.000-04:00
Apply 'kconfig: "output yaml" renders boolean N as a comment'
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
@@ -736,7 +736,7 @@ static void __print_yaml_symbol(FILE *fp, struct symbol *sym,
 static void print_symbol_for_dotconfig(FILE *fp, FILE *yaml, struct symbol *sym)
 {
 	__print_symbol(fp, sym, OUTPUT_N_AS_UNSET, true);
-	__print_yaml_symbol(yaml, sym, OUTPUT_N_AS_UNSET, true);
+	__print_yaml_symbol(yaml, sym, OUTPUT_N, true);
 }
 
 static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym)

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ static void __print_yaml_symbol(FILE fp, struct symbol sym,`
`736`	`736`	`static void print_symbol_for_dotconfig(FILE fp, FILE yaml, struct symbol *sym)`
`737`	`737`	`{`
`738`	`738`	`__print_symbol(fp, sym, OUTPUT_N_AS_UNSET, true);`
`739`		`- __print_yaml_symbol(yaml, sym, OUTPUT_N_AS_UNSET, true);`
	`739`	`+ __print_yaml_symbol(yaml, sym, OUTPUT_N, true);`
`740`	`740`	`}`
`741`	`741`
`742`	`742`	`static void print_symbol_for_autoconf(FILE fp, struct symbol sym)`