From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Schwierzeck Date: Fri, 3 Jun 2016 00:08:09 +0200 Subject: [U-Boot] [PATCH] clk: convert API to match reset/mailbox style In-Reply-To: <5750AD0A.30309@wwwdotorg.org> References: <20160523174710.1712-1-swarren@wwwdotorg.org> <5750661D.4050402@wwwdotorg.org> <5750911D.2080901@wwwdotorg.org> <5750A933.9000606@gmail.com> <5750AD0A.30309@wwwdotorg.org> Message-ID: <5750AE49.3020703@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am 03.06.2016 um 00:02 schrieb Stephen Warren: > On 06/02/2016 03:46 PM, Daniel Schwierzeck wrote: >> >> >> 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. > > Oh right, it looks like "-3" is required to make the commit apply > correctly since there have been some minor context changes since I > created the patch, and that option uses the file SHA information in the > patch, and when I ran "git format-patch" the commit wasn't based > directly on upstream (I had some irrelevant intervening commits) so the > file SHAs in the patch don't exist outside my local repo, and hence the > messages you see. > > You can resolve this by: > > git fetch git://github.com/swarren/u-boot.git tmp > git cherry-pick d0b430a197317dd843a09e33359c251ea5f41e6c > > It's probably not worth my reposting the patch until it has comments. > ok, that worked. Thanks. -- - Daniel -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: