On Fri, Oct 22, 2021 at 10:47 PM Thorsten Berger <thorsten.berger@xxxxxx> wrote: > > Co-developed-by: Patrick Franz <deltaone@xxxxxxxxxx> > Signed-off-by: Patrick Franz <deltaone@xxxxxxxxxx> > Co-developed-by: Ibrahim Fayaz <phayax@xxxxxxxxx> > Signed-off-by: Ibrahim Fayaz <phayax@xxxxxxxxx> > Reviewed-by: Luis Chamberlain <mcgrof@xxxxxxxx> > Tested-by: Evgeny Groshev <eugene.groshev@xxxxxxxxx> > Suggested-by: Sarah Nadi <nadi@xxxxxxxxxxx> > Suggested-by: Thorsten Berger <thorsten.berger@xxxxxx> > Signed-off-by: Thorsten Berger <thorsten.berger@xxxxxx> > > The tool can be called from any configurator. We chose to modify xconfig for > this purpose. These files contain the necessary modifications to xconfig > in order to resolve conflicts. > --- > scripts/kconfig/qconf.cc | 1003 +++++++++++++++++++++++++++++--------- > scripts/kconfig/qconf.h | 179 ++++++- > 2 files changed, 929 insertions(+), 253 deletions(-) > This includes too many unneeded changes. (it is reverting many commits). Please rebase it properly. -- Best Regards Masahiro Yamada
