[U-Boot] [PATCH] clk: convert API to match reset/mailbox style

[Daniel Schwierzeck]

Am 02.06.2016 um 22:03 schrieb Stephen Warren:
>> could you rebase the patch to current mainline?. I couldn't apply it
>> some days ago. Thanks.
> 
> It seems to work fine for me; see log below. What problem are you seeing?
> 
> [swarren at swarren-lx1 u-boot]$ git checkout u-boot/master
> HEAD is now at 8b528709c5bb... spl: fit: Fix load address of fit header
> 
> [swarren at swarren-lx1 u-boot]$ git am -3 -s ~/\[U-Boot\]\ \[PATCH\]\
> clk\:\ convert\ API\ to\ match\ reset_mailbox\ style.eml
> Applying: clk: convert API to match reset/mailbox style
> Using index info to reconstruct a base tree...
> M    arch/sandbox/dts/test.dts
> M    drivers/clk/clk_rk3288.c
> M    drivers/clk/uniphier/clk-uniphier-mio.c
> M    drivers/gpio/rk_gpio.c
> M    drivers/mmc/rockchip_dw_mmc.c
> M    drivers/mmc/uniphier-sd.c
> M    drivers/video/rockchip/rk_vop.c
> Falling back to patching base and 3-way merge...
> Removing include/clk.h
> Auto-merging drivers/video/rockchip/rk_vop.c
> Auto-merging drivers/mmc/uniphier-sd.c
> Auto-merging drivers/mmc/rockchip_dw_mmc.c
> Auto-merging drivers/gpio/rk_gpio.c
> Auto-merging drivers/clk/uniphier/clk-uniphier-mio.c
> Auto-merging drivers/clk/clk_rk3288.c
> Auto-merging arch/sandbox/dts/test.dts
> 

I always get this:

daniel at workstation:/work/u-boot$ pwclient get 625342
Saved patch to U-Boot-clk-convert-API-to-match-reset-mailbox-style.patch

daniel at workstation:/work/u-boot$ git am -3 U-Boot-clk-convert-API-to-match-reset-mailbox-style.patch
Applying: clk: convert API to match reset/mailbox style
fatal: sha1 information is lacking or useless (arch/sandbox/dts/test.dts).
error: could not build fake ancestor
Patch failed at 0001 clk: convert API to match reset/mailbox style
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

I'm seeing the same error with "[PATCH] clk: convert API to match reset_mailbox style.eml". 

I've tried with git 2.7.4 and 2.8.3 and also with a fresh git clone but nothing helps.

-- 
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160602/56799cd4/attachment.sig>