Wolfgang Denk wrote:
Dear Andy,
in message Pine.LNX.4.61.0801091112540.1264@ld0175-tx32.am.freescale.net you wrote:
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
[snip]
Sorry, can you please rebase your repo against current U-Boot? I get a merge conflict for include/fdt_support.h ...
Auto-merged MAINTAINERS Auto-merged MAKEALL Auto-merged Makefile Auto-merged common/fdt_support.c Auto-merged include/fdt_support.h CONFLICT (content): Merge conflict in include/fdt_support.h Automatic merge failed; fix conflicts and then commit the result.
This may be my fault if you are seeing the same thing as me. It looks like I goofed up git when I redid a patch to delete the erroneous embedded space (search for ^I ^I) in: + err = fdt_setprop(fdt, nodeoffset, + "linux,initrd-start", &tmp, sizeof(tmp));
The solution is to simply keep the line without the space, delete the other line and the git merge marker lines.
Sorry for gumming up the merge, gvb