Re: [PATCH -perfbook 0/5] ebook reader size support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Mar 25, 2021 at 07:49:44PM +0900, Akira Yokosawa wrote:
> Hi Balbir and Paul,
> 
> So, this is a revised patch set based on the RFC PATCH from
> Balbir.
> 
> Hearing no objection to the rename of "-er" to "-eb",
> I did the rename in Patch 1/5 of Balbir's.
> Patch 2/5 is an updated one I sent earlier, with additional 
> float-barrier macro for ebooksize build and minor tweaks.
> Note that the extra blank line at the bottom of \ebresizeverb
> is now fixed.
> Patch 3/5 is also an updated one I sent earlier.
> Patch 4/5 shrinks floats in styleguide.
> Patch 5/5 updates help text in Makefile to mention build targets
> for ebooksize.  They are marked as (WIP) for the moment.
> 
> This set can be applied to current master.

When I try "git am -s -3", I get this:

------------------------------------------------------------------------

Applying: perfbook-lt: Add macro to shrink floats for ebook
fatal: sha1 information is lacking or useless (perfbook-lt.tex).
error: could not build fake ancestor
Patch failed at 0001 perfbook-lt: Add macro to shrink floats for ebook
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".

------------------------------------------------------------------------

The usual cause of this is when the series is on top of a few additional
patches in your git archive.  If this is the case, then it is possible
that you can rebase them without git complaining because git analyzes the
intervening patches.  Lacking those intervening patches in my archive,
git just complains at me.

If this is the case, could you please rebase this series onto master,
then resend?  Alternatively, resend including the intervening patches,
allowing me to do the rebase.

If there are no intervening patches in your archive, I have no idea what
is happening.  ;-)

							Thanx, Paul

>        Thanks, Akira
> 
> --
> Akira Yokosawa (4):
>   perfbook-lt: Add macros to shrink floats for ebook
>   cpu, toolsoftrade, count, rcuapi: Shrink floats for ebook reader
>   styleguide: Adjust float size and add a floatbarrier for ebook-size
>     build
>   Makefile: Add info on ebooksize build in help and help-full
> 
> Balbir Singh (1):
>   perfbook/papersize: ebook reader size support
> 
>  Makefile                           | 21 +++++++++-
>  appendix/styleguide/styleguide.tex | 12 ++++++
>  count/count.tex                    | 15 ++++++--
>  cpu/overheads.tex                  |  2 +
>  defer/rcuapi.tex                   | 12 +++++-
>  perfbook-lt.tex                    | 62 ++++++++++++++++++++++++++----
>  toolsoftrade/toolsoftrade.tex      |  2 +
>  7 files changed, 111 insertions(+), 15 deletions(-)
> 
> -- 
> 2.17.1
> 
> 



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux