lkml.org 
[lkml]   [2009]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: git-apply --whitespace (Re: [PATCH 2/5] ACPI, APEI, APEI supporting infrastructure)
    From
    Date
    On Thu, 2009-12-31 at 09:14 +0800, Len Brown wrote:
    > > diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
    > > new file mode 100644
    > > index 0000000..4085bdd
    > > --- /dev/null
    > > +++ b/drivers/acpi/apei/Kconfig
    > > @@ -0,0 +1,9 @@
    > > +config ACPI_APEI
    > > + tristate "ACPI Platform Error Interface (APEI)"
    > > + depends on X86
    > > + help
    > > + APEI allows to report errors (for example from the chipset)
    > > + to the operating system. This improves NMI handling
    > > + especially. In addition it supports error serialization and
    > > + error injection.
    > > +
    > > diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile
    >
    > FYI, git apply considers a trailing blank line,
    > such as the one at the end of the hunk above,
    > to be a "whitespace error".
    >
    > I use --whitespace=strip, which causes git to delete it
    > upon checkin. However, that causes the 4th patch in
    > this series, which appents to this file, to not apply.
    >
    > Please don't send patches with trailing blank lines.
    > In this case, the blank should come as a "preceeding"
    > blank line in the 4th patch...

    Sorry about that. I will be more careful in next time.

    Best Regards,
    Huang Ying




    \
     
     \ /
      Last update: 2009-12-31 02:21    [W:0.022 / U:118.136 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site