linux-kernel - Re: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <45E1F766.1070800@garzik.org>
Date:	Sun, 25 Feb 2007 15:53:58 -0500
From:	Jeff Garzik <jeff@...zik.org>
To:	Mikael Pettersson <mikpe@...uu.se>
CC:	linux-ide@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error

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@...uu.se>
> 
> ---
> 
>  drivers/ata/sata_promise.c |    1 +
>  1 files changed, 1 insertion(+)

applied both patches


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/