Re: [Patch v4 3/9] driver/edac/fsl-ddr: Separate FSL DDR EDAC driver from MPC85xx

[Borislav Petkov]

On Tue, Aug 09, 2016 at 02:55:40PM -0700, York Sun wrote:
> The mpc85xx compatible DDR controllers are used on ARM-based SoCs.
> Separate the DDR part from mpc85xx EDAC driver and prepare to support
> both architecture.
> 
> Signed-off-by: York Sun <york.sun@xxxxxxx>
> 
> ---
> Change log
>   v4: Change comment in file header
>       Use lower case "fsl_ddr_edac" for EDAC_MOD_STR
>       Drop exporting probe and remove symbols
>   v3: Fix compiling errors and warnings caused by patch ordering
>   v2: Reordered patch
>       Separate FSL DDR commont code as shared object, not another driver
>       This patch is generated with "git format-patch -M40 -C40" to show
>       copy-and-delete.

This patch doesn't apply this way:

$ git apply --check -v < /tmp/03-driver-edac-fsl-ddr-separate_fsl_ddr_edac_driver_from_mpc85xx.patch
...

error: patch failed: drivers/edac/mpc85xx_edac.c:724
error: drivers/edac/mpc85xx_edac.c: patch does not apply
Checking patch drivers/edac/mpc85xx_edac.h...

$ patch -p1 --dry-run -F10 -i /tmp/03-driver-edac-fsl-ddr-separate_fsl_ddr_edac_driver_from_mpc85xx.patch
checking file drivers/edac/Makefile
checking file drivers/edac/fsl_ddr_edac.c (copied from drivers/edac/mpc85xx_edac.c)
Hunk #3 FAILED at 132.
Hunk #4 succeeded at 1012 (offset -5 lines).
Hunk #5 succeeded at 1080 (offset -7 lines).
Hunk #6 FAILED at 1128.
Hunk #7 succeeded at 1145 (offset -8 lines).
Hunk #8 FAILED at 1173.
3 out of 8 hunks FAILED
checking file drivers/edac/fsl_ddr_edac.h (copied from drivers/edac/mpc85xx_edac.h)
checking file drivers/edac/mpc85xx_edac.c
Hunk #3 FAILED at 627.
1 out of 3 hunks FAILED
checking file drivers/edac/mpc85xx_edac.h

$ git am -i /tmp/york.sun.03
Applying: driver/edac/fsl-ddr: Separate FSL DDR EDAC driver from MPC85xx
error: patch failed: drivers/edac/mpc85xx_edac.c:141
error: drivers/edac/mpc85xx_edac.c: patch does not apply
error: patch failed: drivers/edac/mpc85xx_edac.c:724
error: drivers/edac/mpc85xx_edac.c: patch does not apply
Patch failed at 0001 driver/edac/fsl-ddr: Separate FSL DDR EDAC driver from MPC85xx
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am -i --continue".
If you prefer to skip this patch, run "git am -i --skip" instead.
To restore the original branch and stop patching, run "git am -i --abort".

Please regenerate it against:

http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git#edac-for-4.9

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--