Re: linux-next: manual merge of the driver-core tree with thepcmcia tree

[Greg KH]

On Tue, Feb 02, 2010 at 05:01:59PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/pcmcia/ds.c between commit
> 933a838aa1aae8388438bb002fbdaf6fca519a5c ("pcmcia: make use of
> pcmcia_dev_resume() return value") from the pcmcia tree and commit
> df5a0aec4591ae8a5deb67bc8cb6be3d0812abb2 ("drivers/base: Convert dev->sem
> to mutex") from the driver-core tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Fix looks fine, thanks for carrying it.

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