From: Jeff Garzik <jgarzik@pobox.com>
To: Sergei Shtylyov <sshtylyov@mvista.com>
Cc: linux-ide@vger.kernel.org
Subject: Re: [PATCH] libata: kill ata_irq_on() prototype
Date: Fri, 14 May 2010 17:36:51 -0400 [thread overview]
Message-ID: <4BEDC273.8070301@pobox.com> (raw)
In-Reply-To: <4BEDC09C.3040103@ru.mvista.com>
On 05/14/2010 05:29 PM, Sergei Shtylyov wrote:
> Hello.
>
> Jeff Garzik wrote:
>
>>> Commit 9363c3825ea9ad76561eb48a395349dd29211ed6 renamed ata_irq_on() to
>>> ata_sff_irq_on() but forgot to rename its prototype in "libata.h". This
>>> prototype is duplicate anyway, as the function is already declared in
>>> <linux/libata.h>, so remove it...
>
>>> Signed-off-by: Sergei Shtylyov<sshtylyov@ru.mvista.com>
>
>>> ---
>>> The patch is against the recent Linus' tree.
>
>>> drivers/ata/libata.h | 1 -
>>> 1 file changed, 1 deletion(-)
>
>> applied
>
> Jeff, this patch conflicts with Tejun's recently posted patch:
>
> http://marc.info/?l=linux-ide&m=127352053709702
>
> It would probably have been better to apply Tejun's patch as more complete.
So noted, patch dropped. I was about to turn to Tejun's pile-o-stuff,
and this saved me a bit of time.
Jeff
prev parent reply other threads:[~2010-05-14 21:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-06 18:15 [PATCH] libata: kill ata_irq_on() prototype Sergei Shtylyov
2010-05-14 21:24 ` Jeff Garzik
2010-05-14 21:29 ` Sergei Shtylyov
2010-05-14 21:36 ` 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=4BEDC273.8070301@pobox.com \
--to=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=sshtylyov@mvista.com \
/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