linux-kernel - Re: [PATCH 01/26] staging: et131x: Put all .c files into one big file

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20111019204128.GA6152@kroah.com>
Date:	Wed, 19 Oct 2011 13:41:28 -0700
From:	Greg KH <greg@...ah.com>
To:	Mark Einon <mark.einon@...il.com>
Cc:	gregkh@...e.de, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 01/26] staging: et131x: Put all .c files into one big file

On Tue, Oct 18, 2011 at 05:07:34PM +0100, Mark Einon wrote:
> Created one big .c file for the driver, moving the contents of all
> driver .c files into it.
> 
> Signed-off-by: Mark Einon <mark.einon@...il.com>

Something is wrong here, when I try to apply this patch with git, I get
the following errors:

$ git am -s ../s2
Applying: staging: et131x: Put all .c files into one big file
error: removal patch leaves file contents
error: drivers/staging/et131x/et1310_eeprom.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et1310_mac.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et1310_phy.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et1310_pm.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et1310_rx.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et1310_tx.c: patch does not apply
/home/gregkh/linux/work/staging/.git/rebase-apply/patch:70: new blank line at EOF.
+
error: removal patch leaves file contents
error: drivers/staging/et131x/et131x_ethtool.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et131x_initpci.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et131x_isr.c: patch does not apply
error: removal patch leaves file contents
error: drivers/staging/et131x/et131x_netdev.c: patch does not apply
Patch failed at 0001 staging: et131x: Put all .c files into one big file
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Your patch is in the mbox called '../s2' above.

Care to resend it with the file actually deleted?  How are you
generating this patch?

And, when you resend the series, don't put the [RESEND] in the subject,
I had to edit that out in order to apply them properly (which turned out
to be a waste of time due to this patch not applying...)

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/