$ git apply --reject ../kernel_imx.git/0044-ENGR00162593-1-MX53-RTC-fix-alarm-can-t-wake-up-syst.patch
Checking patch drivers/mfd/da9052-core.c...
error: while searching for:
}
/* Collect all events */
for (cnt = 0; cnt < 4; cnt++)
events_sts |= (eve_data[cnt].data << (8 * cnt));
/* Check if we really got any event */
if (events_sts == 0) {
error: patch failed: drivers/mfd/da9052-core.c:310
Checking patch drivers/rtc/rtc-da9052.c...
Applying patch drivers/mfd/da9052-core.c with 1 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/rtc/rtc-da9052.c cleanly.
$ git status
# On branch fsl
# Your branch is ahead of 'origin/lanke' by 43 commits.
#
# Changed but not updated:
# (use "git add ..." to update what will be committed)
# (use "git checkout -- ..." to discard changes in working directory)
#
# modified: drivers/mfd/da9052-core.c
# modified: drivers/rtc/rtc-da9052.c
#
# Untracked files:
# (use "git add ..." to include in what will be committed)
#
# drivers/mfd/da9052-core.c.rej
no changes added to commit (use "git add" and/or "git commit -a")
根据drivers/mfd/da9052-core.c.rej手动解决冲突的代码。
然后git add 修改好的代码，执行git am --resolved完成
生成patch:
git format-patch origin/fsl..fsl -o 生成patch所放的目录
