Re: [U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files