lkml.org 
[lkml]   [2010]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging-next tree with the pcmcia tree
On Mon, Aug 02, 2010 at 01:57:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commits
> 9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
> after call to pcmcia_request_io()") and
> cd8ae1e0a5d36406b518cea25446492f07ddddcf ("pcmcia: do not use io_req_t
> when calling pcmcia_request_io()") from the pcmcia tree and commit
> 6d98be390ab55bb5f617d69aedf9bec27d039b3b ("Staging: wl_cs.c: converted
> space to tabs in wl_cs.c") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Those fixes are fine, thanks for doing this.

greg k-h


\
 
 \ /
  Last update: 2010-08-03 00:33    [W:0.024 / U:1.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site