Hi Daniel, > > Tom, a conflict will happen anyway when pulling u-boot-mips/master. > > why? The branch is rebased to current master so it would be a > fast-forward merge.
Sorry, my misunderstanding. I was seeing your patch file: http://lists.denx.de/pipermail/u-boot/2014-April/177675.html You had already rebased it. Best Regards Masahiro Yamada _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
