Tom, A merge-artifact slipped in with the last round of merges. Here’s a PR to remove these (I didn’t throw this at Travis for obvious reasons...).
Thanks, Philipp. The following changes since commit e5fd39c886485e3dec77f4438a6e364c2987cf5f: Merge tag 'for-master-20190201' of git://git.denx.de/u-boot-rockchip (2019-02-02 10:11:20 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip tags/for-master-20190205 for you to fetch changes up to 30477f0500dac67e988498df3b6783372a31c22c: rockchip: Remove rejected files with .rej suffix (2019-02-05 10:34:04 +0100) ---------------------------------------------------------------- Removes artifacts (.rej-files) from the last merge. ---------------------------------------------------------------- Michal Simek (1): rockchip: Remove rejected files with .rej suffix configs/kylin-rk3036_defconfig.rej | 10 ---------- configs/puma-rk3399_defconfig.rej | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 configs/kylin-rk3036_defconfig.rej delete mode 100644 configs/puma-rk3399_defconfig.rej _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot