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

2015-12-04 Thread Thomas Chou
On 2015年12月04日 23:58, Simon Glass wrote: These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Signed-off-by: Simon Glass Reported-by: Stephen Warren --- configs/beaver_defconfig | 3 --- configs/cardhu_defconfig | 3 --- co

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

2015-12-04 Thread Stephen Warren
On 12/04/2015 10:25 AM, Simon Glass wrote: Hi Stephen, On 4 December 2015 at 10:16, Stephen Warren wrote: On 12/04/2015 08:58 AM, Simon Glass wrote: These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Patches 1-3, Tested-by: Steph

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

2015-12-04 Thread Simon Glass
Hi Stephen, On 4 December 2015 at 10:16, Stephen Warren wrote: > On 12/04/2015 08:58 AM, Simon Glass wrote: >> >> These were added by mistake in commit fde7e189. They cause a warning when >> configuring the boards. Remove them. > > > Patches 1-3, > Tested-by: Stephen Warren > > It would be usefu

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

2015-12-04 Thread Stephen Warren
On 12/04/2015 08:58 AM, Simon Glass wrote: These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Patches 1-3, Tested-by: Stephen Warren It would be useful to include the appropriate Fixes: tags in the commit message, and this issue was

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

2015-12-04 Thread Simon Glass
These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Signed-off-by: Simon Glass Reported-by: Stephen Warren --- configs/beaver_defconfig | 3 --- configs/cardhu_defconfig | 3 --- configs/jetson-tk1_defconfig | 3 --- configs/tr