All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
	jack_wang@usish.com
Subject: Re: [GIT PATCH v4 0/2] libsas: eh reworks (ata-eh vs discovery, races, ...)
Date: Mon, 16 Jan 2012 12:40:28 +0400	[thread overview]
Message-ID: <1326703228.2872.5.camel@dabdike> (raw)
In-Reply-To: <CABE8wwuBN45f2s-bcW3R=5VE1V3svtcrp93-9LW5zZ6VtZFqmQ@mail.gmail.com>

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@hansenpartnership.com> 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

James



  reply	other threads:[~2012-01-16  8:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-10  7:38 [GIT PATCH v4 0/2] libsas: eh reworks (ata-eh vs discovery, races, ...) Dan Williams
2012-01-10  7:38 ` [PATCH v4 1/2] libsas: pre-clean commands that won the eh vs completion race Dan Williams
2012-01-10  7:38 ` [PATCH v4 2/2] libsas: feed the scsi_block_when_processing_errors() meter Dan Williams
2012-01-10 19:29 ` [GIT PATCH v4 0/2] libsas: eh reworks (ata-eh vs discovery, races, ...) James Bottomley
2012-01-10 20:18   ` Dan Williams
2012-01-16  8:40     ` James Bottomley [this message]
2012-01-16 17:00       ` Dan Williams
2012-01-16 20:24         ` James Bottomley
2012-01-16 20:44           ` Dan Williams
2012-01-13  0:57 ` Jack Wang
2012-01-13  1:21   ` Dan Williams
2012-01-13  1:37     ` Jack Wang
2012-01-13  1:51       ` Dan Williams

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=1326703228.2872.5.camel@dabdike \
    --to=james.bottomley@hansenpartnership.com \
    --cc=dan.j.williams@intel.com \
    --cc=jack_wang@usish.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.