* [U-Boot] [PULL] Please pull u-boot-rockchip: tags/for-master-20190205
@ 2019-02-05 9:38 Philipp Tomsich
2019-02-08 3:13 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Tomsich @ 2019-02-05 9:38 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [U-Boot] [PULL] Please pull u-boot-rockchip: tags/for-master-20190205
2019-02-05 9:38 [U-Boot] [PULL] Please pull u-boot-rockchip: tags/for-master-20190205 Philipp Tomsich
@ 2019-02-08 3:13 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2019-02-08 3:13 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190207/e9e1cbd7/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-08 3:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 9:38 [U-Boot] [PULL] Please pull u-boot-rockchip: tags/for-master-20190205 Philipp Tomsich
2019-02-08 3:13 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox