From: Borislav Petkov <bp@alien8.de>
To: York Sun <york.sun@nxp.com>
Cc: linux-edac@vger.kernel.org, morbidrsa@gmail.com,
oss@buserror.net, stuart.yoder@nxp.com,
Doug Thompson <dougthompson@xmission.com>,
mchehab@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [Patch v4 3/9] driver/edac/fsl-ddr: Separate FSL DDR EDAC driver from MPC85xx
Date: Thu, 11 Aug 2016 15:36:12 +0200 [thread overview]
Message-ID: <20160811133612.GA5801@nazgul.tnic> (raw)
In-Reply-To: <1470779760-16483-4-git-send-email-york.sun@nxp.com>
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@nxp.com>
>
> ---
> 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.
--
next prev parent reply other threads:[~2016-08-11 13:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1470779760-16483-1-git-send-email-york.sun@nxp.com>
2016-08-09 21:55 ` [Patch v4 1/9] driver/edac/mpc85xx_edac: Drop setting/clearing RFXE bit in HID1 York Sun
2016-08-09 21:55 ` [Patch v4 2/9] driver/edac/mpc85xx_edac: Replace printk with proper pr_* format York Sun
2016-08-09 21:55 ` [Patch v4 3/9] driver/edac/fsl-ddr: Separate FSL DDR EDAC driver from MPC85xx York Sun
2016-08-11 13:36 ` Borislav Petkov [this message]
2016-08-11 15:05 ` york sun
2016-08-11 20:13 ` york sun
2016-08-09 21:55 ` [Patch v4 4/9] driver/edac/fsl_ddr: Rename macros and names York Sun
2016-08-09 21:55 ` [Patch v4 5/9] driver/edac/fsl_ddr: Add DDR types York Sun
2016-08-09 21:55 ` [Patch v4 6/9] driver/edac/fsl_ddr: Add support of little endian York Sun
2016-08-10 22:26 ` Rob Herring
2016-08-12 7:41 ` Borislav Petkov
2016-08-09 21:55 ` [Patch v4 7/9] driver/edac/fsl_ddr: Fix kernel warning when module is removed York Sun
2016-08-09 21:55 ` [Patch v4 8/9] driver/edac/layerscape_edac: Add Layerscape EDAC support York Sun
2016-08-12 9:12 ` Borislav Petkov
2016-08-23 16:46 ` york sun
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=20160811133612.GA5801@nazgul.tnic \
--to=bp@alien8.de \
--cc=dougthompson@xmission.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=morbidrsa@gmail.com \
--cc=oss@buserror.net \
--cc=stuart.yoder@nxp.com \
--cc=york.sun@nxp.com \
/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