Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754562AbZGVCAB (ORCPT ); Tue, 21 Jul 2009 22:00:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752354AbZGVCAA (ORCPT ); Tue, 21 Jul 2009 22:00:00 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:59637 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752034AbZGVCAA (ORCPT ); Tue, 21 Jul 2009 22:00:00 -0400 Date: Wed, 22 Jul 2009 11:59:56 +1000 From: Stephen Rothwell To: David Miller Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Ortiz , Zhu Yi , "John W. Linville" Subject: linux-next: manual merge of the net tree with the wireless-current tree Message-Id: <20090722115956.482777b4.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1262 Lines: 36 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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/net/wireless/iwmc3200wifi/netdev.c index aea5ccf,e94e969..0000000 --- a/drivers/net/wireless/iwmc3200wifi/netdev.c +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c @@@ -151,8 -156,10 +156,10 @@@ void iwm_if_free(struct iwm_priv *iwm return; free_netdev(iwm_to_ndev(iwm)); - iwm_wdev_free(iwm); iwm_priv_deinit(iwm); + iwm_wdev_free(iwm); + kfree(iwm->umac_profile); + iwm->umac_profile = NULL; } int iwm_if_add(struct iwm_priv *iwm) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/