From: Jeff Garzik <jeff@garzik.org>
To: Mikael Pettersson <mikpe@it.uu.se>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error
Date: Sun, 25 Feb 2007 15:53:58 -0500 [thread overview]
Message-ID: <45E1F766.1070800@garzik.org> (raw)
In-Reply-To: <200702251144.l1PBidUj003214@harpo.it.uu.se>
Mikael Pettersson wrote:
> When I merged my 20619 new EH conversion with #libata-upstream
> I had to manually resolve a conflict, and inadvertently lost
> pdc_pata_ops' ->post_internal_cmd binding. Corrected by this patch.
>
> Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
>
> ---
>
> drivers/ata/sata_promise.c | 1 +
> 1 files changed, 1 insertion(+)
applied both patches
prev parent reply other threads:[~2007-02-25 20:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-25 11:44 [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error Mikael Pettersson
2007-02-25 20:53 ` Jeff Garzik [this message]
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=45E1F766.1070800@garzik.org \
--to=jeff@garzik.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikpe@it.uu.se \
/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;
as well as URLs for NNTP newsgroup(s).