mbox series

[U-Boot,PULL] Please pull u-boot-rockchip: tags/for-master-20190205

Message ID D0A69E82-0635-4985-A3C5-F3EE2B685647@theobroma-systems.com
State Accepted
Delegated to: Tom Rini
Headers show
Series [U-Boot,PULL] Please pull u-boot-rockchip: tags/for-master-20190205 | expand

Pull-request

git://git.denx.de/u-boot-rockchip tags/for-master-20190205

Message

Philipp Tomsich Feb. 5, 2019, 9:38 a.m. UTC 
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

Comments

Tom Rini Feb. 8, 2019, 3:13 a.m. UTC | #1 
On Tue, Feb 05, 2019 at 10:38:30AM +0100, Philipp Tomsich wrote:

> 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)
> 

Applied to u-boot/master, thanks!