From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)
Date: Fri, 3 Sep 2010 20:29:07 +0100 [thread overview]
Message-ID: <20100903192907.GA2978@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20100903184351.GC2341@burratino>
On Fri, Sep 03, 2010 at 01:43:51PM -0500, Jonathan Nieder wrote:
> (+cc: bug-patch)
>
> Hi,
>
> Uwe Kleine-K?nig wrote:
> > On Fri, Sep 03, 2010 at 07:18:43PM +0900, Magnus Damm wrote:
>
> >> Using --dry-run is fine, but omitting dry-run gives me:
> >>
> >> ...
> >> patching file arch/arm/common/clkdev.c
> >> patching file arch/sh/include/asm/clkdev.h
> >> Hunk #1 FAILED at 1.
> >> Hunk #2 FAILED at 11.
> >> 2 out of 2 hunks FAILED -- saving rejects to file
> >> arch/sh/include/asm/clkdev.h.rej
> >>
> >> I guess this is caused by the last "renaming" hunk, see below.
>
> Yep, I can reproduce this. Patch applies with "git apply",
> "patch --dry-run -p1" accepts it, "patch -p1" fails.
git patches include additional metadata for renaming files, which gnu patch
will not understand.
If you want GNU patch compatible diffs, don't use -C or -M when generating
patches out of git.
next prev parent reply other threads:[~2010-09-03 19:29 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-31 11:16 [RFC] [PATCH] arm & sh: factorised duplicated clkdev.c Jean-Christophe PLAGNIOL-VILLARD
2010-09-01 9:12 ` Russell King - ARM Linux
2010-09-01 11:13 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-01 23:17 ` Russell King - ARM Linux
2010-09-02 2:37 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-02 2:42 ` Paul Mundt
2010-09-01 9:51 ` Uwe Kleine-König
2010-09-01 11:18 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-01 15:01 ` Uwe Kleine-König
2010-09-01 15:27 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-01 15:40 ` Uwe Kleine-König
2010-09-01 23:18 ` Russell King - ARM Linux
2010-09-02 5:46 ` Uwe Kleine-König
2010-09-02 6:17 ` [PATCH] ARM: omap1/nokia770: mark some functions __init Uwe Kleine-König
2010-09-02 8:03 ` [PATCH 1/5] ARM: omap/fb: move omap_init_fb to .init.text Uwe Kleine-König
2010-09-09 8:40 ` Tomi Valkeinen
2010-09-02 8:03 ` [PATCH 2/5] ARM: omap/fb: move omapfb_reserve_sram " Uwe Kleine-König
2010-09-02 8:03 ` [PATCH 3/5] ARM: omap/fb: move get_fbmem_region() " Uwe Kleine-König
2010-09-02 8:03 ` [PATCH 4/5] ARM: omap: move omap_get_config et al. " Uwe Kleine-König
2010-09-02 8:03 ` [PATCH 5/5] wip: ARM: omap: move omap_board_config_kernel to .init.data Uwe Kleine-König
2011-02-03 8:15 ` [PATCH] ARM: omap1/nokia770: mark some functions __init Uwe Kleine-König
2011-02-08 9:59 ` Uwe Kleine-König
2011-02-09 19:27 ` Tony Lindgren
2011-02-09 20:40 ` [PATCH 1/4] " Uwe Kleine-König
2011-02-09 20:40 ` [PATCH 2/4] ARM: omap: move omap_get_config et al. to .init.text Uwe Kleine-König
2011-02-09 20:40 ` [PATCH 3/4] ARM: omap: move omap_board_config_kernel to .init.data Uwe Kleine-König
2011-02-09 20:40 ` [PATCH 4/4] wip: fix section mismatches in omap1_defconfig Uwe Kleine-König
2011-02-10 0:43 ` [PATCH] ARM: omap1/nokia770: mark some functions __init Tony Lindgren
2010-09-02 8:45 ` [RFC] [PATCH] arm & sh: factorised duplicated clkdev.c Russell King - ARM Linux
2010-09-01 10:01 ` Russell King - ARM Linux
2010-09-01 11:12 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-02 12:48 ` [RFC] [PATCH v2] " Jean-Christophe PLAGNIOL-VILLARD
2010-09-02 13:06 ` Russell King - ARM Linux
2010-09-02 13:26 ` Uwe Kleine-König
2010-09-02 13:47 ` Russell King - ARM Linux
2010-09-02 13:55 ` Uwe Kleine-König
2010-09-02 13:39 ` [PATCH V3] " Jean-Christophe PLAGNIOL-VILLARD
2010-09-03 10:18 ` Magnus Damm
2010-09-03 10:32 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-03 18:23 ` Uwe Kleine-König
2010-09-03 18:43 ` [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c) Jonathan Nieder
2010-09-03 19:29 ` Russell King - ARM Linux [this message]
2010-09-03 19:33 ` Uwe Kleine-König
2010-09-03 19:45 ` Andreas Schwab
2010-09-04 0:03 ` Russell King - ARM Linux
2010-09-04 21:33 ` [bug-patch] " Andreas Gruenbacher
2010-09-04 21:45 ` Russell King - ARM Linux
2010-09-04 21:46 ` Andreas Gruenbacher
2010-09-04 22:01 ` Russell King - ARM Linux
2010-09-04 22:26 ` Andreas Gruenbacher
2010-09-03 19:34 ` Matthieu Moy
2010-09-03 22:58 ` [bug-patch] " Andreas Gruenbacher
2010-09-03 23:32 ` Jonathan Nieder
2010-09-04 21:57 ` Andreas Gruenbacher
2010-09-04 3:21 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-09 9:53 ` [PATCH V3] arm & sh: factorised duplicated clkdev.c Jean-Christophe PLAGNIOL-VILLARD
2010-09-14 7:59 ` Paul Mundt
2010-09-15 5:51 ` Jean-Christophe PLAGNIOL-VILLARD
2010-10-04 19:46 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100903192907.GA2978@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).