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

From: Dominik Brodowski <[email-masked]>
Date: Mon, 16 Jun 2008 10:12:58 +0200

Hi,

On Mon, Jun 16, 2008 at 05:51:26PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the pcmcia tree got a conflict in
> drivers/char/pcmcia/cm4000_cs.c between commit
> d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
> pushdown") from the bkl-removal tree and commit
> 5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
> unlocked_ioctl") from the pcmcia tree.
> 
> It was just overlapping replacement of includes, so I did the obvious
> fixup.

@Stephen: many thanks!

@Alan,@Jonathan: since this is the same patch, just a different title --
shall it be removed from one of our trees?

Thanks,
	Dominik