Hi Minkyu,
On 1 October 2014 19:59, Minkyu Kang mk7.kang@samsung.com wrote:
Hi,
On 01/10/14 11:12, Simon Glass wrote:
Hi Minkyu,
On 30 September 2014 07:47, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Simon Glass,
patch failed at latest u-boot-samsung tree.
error: patch failed: include/configs/smdk5250.h:9 error: include/configs/smdk5250.h: patch does not apply error: patch failed: include/configs/snow.h:9 error: include/configs/snow.h: patch does not apply Patch failed at 0007 exynos: Rename -dt config files to -common
Please check.
The problem is the Kconfig patches which moved the CONFIG_OF options to Kconfig from the board config/*.h files.
If I rebase on samsung you are going to get conflicts when merging to mainline.
So would it be better to sync up to mainline first?
The main rule of samsung tree is to sync with arm tree. I tried to merge after sync with arm tree, but it also failed. So please wait until sync with mainline and arm tree.
I thought about this some more. I could probably resend the patches, then send a 'merge' patch to resolve the conflicts with mainline. I'll take a look.
Regards, Simon