Subject: Re: linux-next: manual merge of pcmcia tree

From: Dominik Brodowski <[email-masked]>
Date: Tue, 24 Jun 2008 15:49:27 +0200

Hi Stephen,

On Mon, Jun 23, 2008 at 05:32:41PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the pcmcia tree got a conflict in
> drivers/ide/legacy/ide-cs.c between commit
> a17bf220231a5061a29a27a99a273246eb3b156e ("pcmcia: add another pata/ide
> ID") from Linus' tree and commit f3aa02c57dec52fbe519c51f741e3a94d19dcb4c
> ("pcmcia: add another pata/ide ID") from the pcmcia tree.
> 
> From the discussion on LKML, I assume the upstream version is correct and
> took that.

Thanks! The two patches which were now (fixed and) sent upstream are now
removed from the pcmcia tree.

Best,
	Dominik