[lkml]   [2010]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the staging-next tree with the pcmcia tree
On Wed, May 12, 2010 at 04:03:52PM +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 commit
> c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit ("") from the
> staging-next tree.
> I fixed it up (see below) and can carry the fix as necessary.

Heh, I just hacked that driver up to build properly, odds are it doesn't
run :)

But your fix looks fine, thanks for it.

greg k-h

 \ /
  Last update: 2010-05-12 21:53    [W:0.045 / U:1.808 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site