lkml.org 
[lkml]   [2009]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the net tree with the wireless-current tree
From
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Jul 2009 11:59:56 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwmc3200wifi/netdev.c between commit
> 513a2396d8e8327aff1ce50bea3fb4f16ff3455b ("iwmc3200wifi: fix NULL pointer
> dereference in iwm_if_free") from the wireless-current tree and commit
> 3549716484a95fd16f7fcf8b68699bd4c803b382 ("iwmc3200wifi: cache keys when
> interface is down") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> as necessary.

Thanks Stephen, I'll let Linville and the wireless folks sort
this one out.


\
 
 \ /
  Last update: 2009-07-22 05:07    [W:0.055 / U:4.636 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site