please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors
From: Uwe Kleine-König <hidden>
Date: 2016-06-15 23:06:47
Hello,
when applying the mail below (without the '> ' prefix) using git am
--scissors the result looks like:
$ git show
commit 26ef0606927cc1979faa4166d7f9f3584b5cdc61
Author: Tony Lindgren [off-list ref]
Date: Tue Oct 6 05:36:17 2015 -0700
memory: omap-gpmc: Fix unselectable debug option for GPMC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug")
added a debug option for GPMC, but somehow managed to keep it unselectable.
[...]
$ git version
git version 2.6.0
The obvious improvement is to strip all headers like git am does without
--scissors.
If someone wants a bounce of the original mail, just ask per PM.
Best regards
Uwe
On Wed, Oct 07, 2015 at 03:41:19AM -0700, Tony Lindgren wrote:quoted hunk
* Uwe Kleine-König [off-list ref] [151007 00:57]:quoted
On Wed, Oct 07, 2015 at 10:45:50AM +0300, Roger Quadros wrote:quoted
How about this instead? NOTE: Apart from matching the register setup with the bootloader you also need to match the GPMC FCLK frequency used by the bootloader else the GPMC timings won't be identical with the bootloader timings.Yeah, sounds better, thanks.quoted
Also you might need to build this patch on top of http://article.gmane.org/gmane.linux.kernel/2054796I talked to Tony about this patch yesterday on irc, but I didn't find it in the archives yet when I sent my mail.Yes sorry here's a repost with your and Roger's changes folded in and edited a bit. Probably best to keep them together with this patch. Does the following look OK to you guys? Regards, Tony 8< ---------------- From: Tony Lindgren <tony@atomide.com> Date: Tue, 6 Oct 2015 05:36:17 -0700 Subject: [PATCH] memory: omap-gpmc: Fix unselectable debug option for GPMC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug") added a debug option for GPMC, but somehow managed to keep it unselectable. This probably happened because I had some uncommitted changes and the GPMC option is selected in the platform specific Kconfig. Let's also update the description a bit, it does not mention that enabling the debug option also disables the reset of GPMC controller during the init as pointed out by Uwe Kleine-König [off-list ref] and Roger Quadros [off-list ref]. Fixes: 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug") Reported-by: Uwe Kleine-König <redacted> Signed-off-by: Tony Lindgren <tony@atomide.com>--- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig@@ -58,12 +58,18 @@ config OMAP_GPMC memory drives like NOR, NAND, OneNAND, SRAM. config OMAP_GPMC_DEBUG - bool + bool "Enable GPMC debug output and skip reset of GPMC during init" depends on OMAP_GPMC help Enables verbose debugging mostly to decode the bootloader provided - timings. Enable this during development to configure devices - connected to the GPMC bus. + timings. To preserve the bootloader provided timings, the reset + of GPMC is skipped during init. Enable this during development to + configure devices connected to the GPMC bus. + + NOTE: In addition to matching the register setup with the bootloader + you also need to match the GPMC FCLK frequency used by the + bootloader or else the GPMC timings won't be identical with the + bootloader timings. config MVEBU_DEVBUS bool "Marvell EBU Device Bus Controller"
-- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |