From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: michaelc@cs.wisc.edu
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH 14/25] libiscsi: rename iscsi_cmd_task to iscsi_task
Date: Thu, 05 Jun 2008 09:53:00 -0500 [thread overview]
Message-ID: <1212677580.13549.25.camel@localhost.localdomain> (raw)
In-Reply-To: <1211403260-5487-15-git-send-email-michaelc@cs.wisc.edu>
On Wed, 2008-05-21 at 15:54 -0500, michaelc@cs.wisc.edu wrote:
> From: Mike Christie <michaelc@cs.wisc.edu>
>
> This is the second part of the iscsi task merging, and
> all it does it rename iscsi_cmd_task to iscsi_task and
> mtask/ctask to just task.
OK, I've rebased the scsi-misc tree up to 2.6.26-rc5 (which includes the
rc-fixes tree) and I still can't get this to apply:
patching file drivers/scsi/libiscsi.c
Hunk #4 FAILED at 197.
Hunk #8 FAILED at 301.
Hunk #9 FAILED at 320.
Hunk #10 FAILED at 362.
Hunk #11 FAILED at 413.
Hunk #12 FAILED at 437.
Hunk #13 FAILED at 451.
Hunk #14 FAILED at 481.
Hunk #15 FAILED at 501.
Hunk #16 FAILED at 549.
Hunk #17 succeeded at 606 (offset -16 lines).
Hunk #18 FAILED at 634.
Hunk #19 FAILED at 650.
Hunk #20 FAILED at 696.
Hunk #21 FAILED at 742.
Hunk #22 FAILED at 792.
Hunk #23 FAILED at 802.
Hunk #24 FAILED at 822.
Hunk #25 succeeded at 903 with fuzz 1 (offset 46 lines).
Hunk #26 FAILED at 926.
Hunk #27 FAILED at 938.
Hunk #28 succeeded at 854 (offset -55 lines).
Hunk #29 FAILED at 902.
Hunk #30 FAILED at 955.
Hunk #31 FAILED at 968.
Hunk #32 succeeded at 1106 (offset 66 lines).
Hunk #33 succeeded at 1017 (offset -55 lines).
Hunk #34 succeeded at 1191 (offset 66 lines).
Hunk #35 FAILED at 1259.
Hunk #36 FAILED at 1404.
Hunk #37 FAILED at 1447.
Hunk #38 succeeded at 1340 (offset -55 lines).
Hunk #39 FAILED at 1433.
Hunk #40 FAILED at 1457.
Hunk #41 FAILED at 1483.
Hunk #42 succeeded at 1621 (offset 66 lines).
Hunk #43 succeeded at 1535 (offset -55 lines).
Hunk #44 FAILED at 1555.
Hunk #45 FAILED at 1567.
Hunk #46 succeeded at 1705 (offset 66 lines).
Hunk #47 succeeded at 1597 (offset -55 lines).
Hunk #48 succeeded at 1726 (offset 66 lines).
Hunk #49 FAILED at 1773.
Hunk #50 FAILED at 1954.
Hunk #51 FAILED at 1962.
Hunk #52 FAILED at 1970.
Hunk #53 FAILED at 2007.
Hunk #54 FAILED at 2103.
Hunk #55 FAILED at 2186.
Hunk #56 FAILED at 2267.
Hunk #57 FAILED at 2314.
39 out of 57 hunks FAILED -- saving rejects to file
drivers/scsi/libiscsi.c.rej
patching file include/scsi/libiscsi.h
Hunk #1 succeeded at 104 (offset 12 lines).
Hunk #2 succeeded at 119 (offset -1 lines).
Hunk #3 FAILED at 150.
Hunk #4 FAILED at 166.
Hunk #5 succeeded at 297 with fuzz 2 (offset 12 lines).
Hunk #6 FAILED at 377.
3 out of 6 hunks FAILED -- saving rejects to file
include/scsi/libiscsi.h.rej
patching file include/scsi/scsi_transport_iscsi.h
Hunk #1 FAILED at 33.
Hunk #2 FAILED at 112.
2 out of 2 hunks FAILED -- saving rejects to file
include/scsi/scsi_transport_iscsi.h.rej
James
next prev parent reply other threads:[~2008-06-05 14:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-21 20:53 iscsi update for 2.6.27 michaelc
2008-05-21 20:53 ` [PATCH 01/25] iscsi class, iscsi_tcp/iser: add host arg to session creation michaelc
2008-05-21 20:53 ` [PATCH 02/25] iscsi class, iscsi drivers: remove unused iscsi_transport attrs michaelc
2008-05-21 20:53 ` [PATCH 03/25] iscsi class: rename iscsi_host to iscsi_cls_host michaelc
2008-05-21 20:53 ` [PATCH 04/25] iscsi: remove session and host binding in libiscsi michaelc
2008-05-21 20:54 ` [PATCH 05/25] iscsi: add iscsi host helpers michaelc
2008-05-21 20:54 ` [PATCH 06/25] iscsi: remove session/conn_data_size from iscsi_transport michaelc
2008-05-21 20:54 ` [PATCH 07/25] iscsi: modify iscsi printk so it can take driver data pointers michaelc
2008-05-21 20:54 ` [PATCH 08/25] iser: fix handling of scsi cmnds during recovery michaelc
2008-05-21 20:54 ` [PATCH 09/25] libiscsi, iscsi_tcp, iser: add session cmds array accessor michaelc
2008-05-21 20:54 ` [PATCH 10/25] libiscsi: modify libiscsi so it supports offloaded data paths michaelc
2008-05-21 20:54 ` [PATCH 11/25] libiscsi: merge iscsi_mgmt_task and iscsi_cmd_task michaelc
2008-05-21 20:54 ` [PATCH 12/25] iscsi_tcp: convert iscsi_tcp to support merged tasks michaelc
2008-05-21 20:54 ` [PATCH 13/25] iser: convert ib_iser " michaelc
2008-05-21 20:54 ` [PATCH 14/25] libiscsi: rename iscsi_cmd_task to iscsi_task michaelc
2008-05-21 20:54 ` [PATCH 15/25] iscsi_tcp: handle iscsi_cmd_task rename michaelc
2008-05-21 20:54 ` [PATCH 16/25] iser: " michaelc
2008-05-21 20:54 ` [PATCH 17/25] iscsi class: user device_for_each_child instead of duplicating session list michaelc
2008-05-21 20:54 ` [PATCH 18/25] iscsi class: add endpoint class michaelc
2008-05-21 20:54 ` [PATCH 19/25] iser: Modify iser to take a iscsi_endpoint struct in ep callouts and session setup michaelc
2008-05-21 20:54 ` [PATCH 20/25] iscsi_tcp: hook iscsi_tcp into iscsi_endpoint code michaelc
2008-05-21 20:54 ` [PATCH 21/25] iscsi class: Add session initiatorname and ifacename sysfs attrs michaelc
2008-05-21 20:54 ` [PATCH 22/25] libiscsi: fix cmds_max setting michaelc
2008-05-21 20:54 ` [PATCH 23/25] libiscsi, iser, tcp: remove recv_lock michaelc
2008-05-21 20:54 ` [PATCH 24/25] Replace __FUNCTION__ with __func__ in iscsi_tcp michaelc
2008-05-21 20:54 ` [PATCH 25/25] scsi: use get_unaligned_* helpers michaelc
2008-06-05 14:53 ` James Bottomley [this message]
2008-06-05 15:00 ` [PATCH 14/25] libiscsi: rename iscsi_cmd_task to iscsi_task James Bottomley
2008-05-21 21:06 ` iscsi update for 2.6.27 Mike Christie
2008-05-22 9:31 ` Boaz Harrosh
2008-05-22 16:37 ` Mike Christie
2008-05-22 16:42 ` Mike Christie
2008-05-26 8:31 ` [PATCH] iscsi_tcp: Enable any size command Boaz Harrosh
2008-06-05 15:16 ` James Bottomley
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=1212677580.13549.25.camel@localhost.localdomain \
--to=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
/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