On Sat, 03 Aug 2019 13:22:11 +0000 Sasha Levin sashal@kernel.org wrote:
Hi,
[This is an automated email]
Hello,
Sorry about the late reply.
This commit has been processed because it contains a "Fixes:" tag, fixing commit: 8e2442a5f86e kconfig: fix missing choice values in auto.conf.
The bot has tested the following trees: v5.2.5, v4.19.63.
v5.2.5: Build OK! v4.19.63: Failed to apply! Possible dependencies: aff11cd983ec ("kconfig: Terminate menu blocks with a comment in the generated config")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
The merge conflict is a very minor one involving the difference between the following two code blocks:
v4.19.y const char *str; char dirname[PATH_MAX+1], tmpname[PATH_MAX+22], newname[PATH_MAX+8]; char *env;
next/master (and v5.2.y) const char *str; char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1]; char *env; bool need_newline = false;
This patch inserts the variable "int i;" between "char *env;" and "bool need_newline = false;", but this does not work due to v4.19.y not having the same context.
-- Thanks, Sasha
Thank you,
Vefa