Messages in this thread | | | Subject | Re: linux-next: manual merge of the net tree with the wireless-current tree | From | Zhu Yi <> | Date | Wed, 22 Jul 2009 10:05:21 +0800 |
| |
On Wed, 2009-07-22 at 09:59 +0800, Stephen Rothwell wrote: > Hi David, > > 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.
Hi Stephen,
The correct fix should be http://git.kernel.org/?p=linux/kernel/git/linville/wireless-testing.git;a=commitdiff;h=126e91ba8cfe45a772aad2f51049ac7cedf5bbfd
We need to make the free wdev the last one.
Thanks, -yi
| |