Re: linux-next: manual merge of the staging-next tree with thepcmcia tree
From: Greg KH
Date: Mon Aug 02 2010 - 18:31:27 EST
On Mon, Aug 02, 2010 at 01:57:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/comedi/drivers/quatech_daqp_cs.c between commit
> 9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
> after call to pcmcia_request_io()") from the pcmcia tree and commit
> 3420f6b4c1ac731e80d0911e0092705992cef14f ("Staging: comedi: drivers: fix
> coding style issues in quatech_daqp_cs.c") from the staging-next tree.
> Just context changes. I fixed it up (see below) and can carry the fixes
> as necessary.
Those fixes are fine.
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/