On Mon, 2012-01-16 at 09:00 -0800, Dan Williams wrote: > On Mon, 2012-01-16 at 12:40 +0400, James Bottomley wrote: > > On Tue, 2012-01-10 at 12:18 -0800, Dan Williams wrote: > > > On Tue, Jan 10, 2012 at 11:29 AM, James Bottomley > > > <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote: > > > > On Mon, 2012-01-09 at 23:38 -0800, Dan Williams wrote: > > > >> The latest version of the patch kit is available here: > > > >> > > > >> git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git libsas-eh-reworks-v4 > > > >> > > > >> Changes since v3: http://marc.info/?l=linux-scsi&m=132581455214789&w=2 > > > > > > > > Just to check I'm not lost here. I think this is currently the only > > > > mergeable set of patches you have because you're reworking patches in > > > > all your other series and will repost ... is this correct? > > > > > > There are two mergeable topics in isci.git: > > > libsas-eh-reworks-v4: mergeable > > > devel: mergeable, posted as "[GIT PATCH v2 00/15] isci update for 3.3 > > > (part1)" [1]. This contains all the general updates to the driver > > > that were independent of the libsas churn. It was rebased to > > > incorporate Ben's firmware removal patch, but is otherwise idle and > > > ready to merge. > > > > 1/2 doesn't apply: > > > > patching file drivers/scsi/libsas/sas_scsi_host.c > > Hunk #1 succeeded at 235 with fuzz 2 (offset -14 lines). > > Hunk #2 FAILED at 267. > > Hunk #3 succeeded at 505 with fuzz 2 (offset -25 lines). > > Hunk #4 succeeded at 512 with fuzz 1 (offset -34 lines). > > Hunk #5 FAILED at 655. > > 2 out of 5 hunks FAILED -- saving rejects to file > > drivers/scsi/libsas/sas_scsi_host.c.rej > > > > ...and you have the pre-requisites to > drivers/scsi/libsas/sas_scsi_host.c? > > d7ca96e libsas: kill sas_slave_destroy > eb4a9d3 libsas: fix domain_device leak > 07ec747 libsas: remove ata_port.lock management duties from lldds > 8f2c41b libsas: convert dev->gone to flags > 2145ed7 libsas: close error handling vs sas_ata_task_done() race > 9540580b libsas: prevent double completion of scmds from eh > 630efd3 libsas: fix timeout vs completion race > 41707de libsas: let libata handle command timeouts > 6b7b289 libsas: defer SAS_TASK_NEED_DEV_RESET commands to libata > b13a7df libsas: sas_phy_enable via transport_sas_phy_reset > 3b58c03 libsas: fix sas_find_local_phy(), take phy references > > I managed to confuse things by posting only incremental series... the > full set is in git, and I can repost as needed. Well, no, when I asked you said the libsas series was pending rewrite. Specifically [PATCH v3 03/14] libsas: prevent domain rediscovery competing with ata error handling I think ... have you reposted that? James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
