linux-next: manual merge of the wireless-next tree with the net-next tree

Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/ath/ath9k/recv.c between commit 67ddc87f162e ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") from the net-next tree and commit f3b6a488a670 ("Merge branch 'master' of git://git.kern

linux-next: manual merge of the wireless-next tree with the net-next tree

Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/rtlwifi/rtl8192ce/phy.h between commit a958df5dc306 ("rtlwifi: Remove extern from function prototypes") from the net-next tree and commit 3a1ea9fd9351 ("rtlwifi: remove duplicate declarations and mac

RE: linux-next: manual merge of the wireless-next tree with the net-next tree

Hi Stephen, > Today's linux-next merge of the wireless-next tree got a conflict in > net/wireless/nl80211.c between merge commits from the net-next tree and > commit 86e8cf98de3e ("nl80211: use small state buffer for wiphy_dump") > from the wireless-next tree. Looks good, yes. > I think I fixed

linux-next: manual merge of the wireless-next tree with the net-next tree

Hi John, Today's linux-next merge of the wireless-next tree got a conflict in net/wireless/nl80211.c between merge commits from the net-next tree and commit 86e8cf98de3e ("nl80211: use small state buffer for wiphy_dump") from the wireless-next tree. I think I fixed it up (see below, please check)

linux-next: manual merge of the wireless-next tree with the net-next tree

Hi John, Today's linux-next merge of the wireless-next tree got a conflict in drivers/net/wireless/ath/ath9k/debug.c between commit 27d7f47756f4 ("net: wireless: replace strict_strtoul() with kstrtoul()") from the net-next tree and commit 6e4d291eec82 ("ath9k: Print ANI statistics in debugfs") fro

Re: linux-next: manual merge of the wireless-next tree with the net-next tree

On Mon, 2013-02-11 at 18:40 +1100, Stephen Rothwell wrote: > Hi all, > > On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho wrote: > > > > On Sun, 2013-02-10 at 18:58 -0800, Joe Perches wrote: > > > On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote: > > > > > > > > Today's linux-next merg

Re: linux-next: manual merge of the wireless-next tree with the net-next tree

Hi all, On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho wrote: > > On Sun, 2013-02-10 at 18:58 -0800, Joe Perches wrote: > > On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the wireless-next tree got conflicts in > > > drivers/net/wireless/ti/

Re: linux-next: manual merge of the wireless-next tree with the net-next tree

On Sun, 2013-02-10 at 18:58 -0800, Joe Perches wrote: > On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote: > > Hi John, > > > > Today's linux-next merge of the wireless-next tree got conflicts in > > drivers/net/wireless/ti/wlcore/sdio.c and > > drivers/net/wireless/ti/wlcore/spi.c between

Re: linux-next: manual merge of the wireless-next tree with the net-next tree

On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless-next tree got conflicts in > drivers/net/wireless/ti/wlcore/sdio.c and > drivers/net/wireless/ti/wlcore/spi.c between commit 0d2e7a5c6080 > ("wireless: Remove unnecessary alloc/OOM me

linux-next: manual merge of the wireless-next tree with the net-next tree

Hi John, Today's linux-next merge of the wireless-next tree got conflicts in drivers/net/wireless/ti/wlcore/sdio.c and drivers/net/wireless/ti/wlcore/spi.c between commit 0d2e7a5c6080 ("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from the net-next tree and commit afb43e6d88e5