Messages in this thread | | | Subject | Re: linux-next: manual merge of the net tree with the wireless-current tree | From | wwguy <> | Date | Tue, 27 Sep 2011 07:41:41 -0700 |
| |
On Tue, 2011-09-27 at 06:09 -0700, John W. Linville wrote: > On Tue, Sep 27, 2011 at 12:51:32PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the net tree got a conflict in > > drivers/net/wireless/iwlwifi/iwl-scan.c between commit 6c80c39d9a69 > > ("iwlagn: fix dangling scan request") from the wireless-current tree and > > commits 63013ae30159 ("iwlagn: priv->status moves to iwl_shared") and > > 6ac2f839b0b2 ("iwlagn: priv->mutex moves to iwl_shared") from the net > > tree. > > > > I fixed it up (see below) and can carry the fix as necessary. > > Looks good, thanks! > Thanks a lot for fixing it.
Wey
| |