In message OF29AD783D.748F78C9-ONC12572AD.0041E8F8@mpl.loc you wrote:
I'm sorry, here the patch with correct mailer settings (hopefully)
Doesn't work for me either:
-> git am -3 -i -u /tmp/patch Commit Body is: -------------------------- Fix bugs in cmd_ide.c and cmd_scsi.c
These bugs prevented to read/write more than one block from/to IDE drives, and didn't allow to use "diskboot" and "scsiboot" to boot from another device than device 0.
Signed-off-by: Denis Peter d.peter@mpl.ch
common/cmd_ide.c | 9 ++++++--- common/cmd_scsi.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying 'Fix bugs in cmd_ide.c and cmd_scsi.c'
error: patch failed: common/cmd_ide.c:423 error: common/cmd_ide.c: patch does not apply error: patch failed: common/cmd_scsi.c:248 error: common/cmd_scsi.c: patch does not apply Using index info to reconstruct a base tree... error: patch failed: common/cmd_ide.c:423 error: common/cmd_ide.c: patch does not apply error: patch failed: common/cmd_scsi.c:248 error: common/cmd_scsi.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001. When you have resolved this problem run "git-am -i -3 --resolved". If you would prefer to skip this patch, instead run "git-am -i -3 --skip".
Same when I try to apply your patch manually:
-> patch -p1 --dry-run </tmp/patch patching file common/cmd_ide.c Hunk #1 FAILED at 423. Hunk #2 FAILED at 1234. Hunk #3 FAILED at 1355. 3 out of 3 hunks FAILED -- saving rejects to file common/cmd_ide.c.rej patching file common/cmd_scsi.c Hunk #1 FAILED at 248. 1 out of 1 hunk FAILED -- saving rejects to file common/cmd_scsi.c.rej
Ah, I think you have also white space corrupted, i. e. spaces instead of tabs.
FIX YOUR MAILER!!!
Best regards,
Wolfgang Denk