Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/cfg.c between commit fa8f136fe9a8 ("mac80211: fix crash on
getting sta info with uninitialized rate control") from the wireless
tree and commit b7ffbd7ef675 ("cfg80211: make ethtool the driver's
responsibility")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/cfg.c between commit fa8f136fe9a8 (mac80211: fix crash on
getting sta info with uninitialized rate control) from the wireless
tree and commit b7ffbd7ef675 (cfg80211: make ethtool the driver's
responsibility) from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/mac80211.c between commit c6a21ff31994
("iwlwifi: mvm: fix merge damage") from the wireless tree and commit
fb98be5e9419 ("iwlwifi: mvm: add unified LMAC scan API") from the
net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/mac80211.c between commit c6a21ff31994
(iwlwifi: mvm: fix merge damage) from the wireless tree and commit
fb98be5e9419 (iwlwifi: mvm: add unified LMAC scan API) from the
net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/mac80211.c between commit 7bacc782270f
("iwlwifi: mvm: disable beacon filtering") from the wireless tree and
commit 73e5f2c5d762 ("iwlwifi: remove IWL_UCODE_TLV_FLAGS_BF_UPDATED
flag") from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/mac80211.c between commit 7bacc782270f
(iwlwifi: mvm: disable beacon filtering) from the wireless tree and
commit 73e5f2c5d762 (iwlwifi: remove IWL_UCODE_TLV_FLAGS_BF_UPDATED
flag) from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/ath/ath9k/recv.c between commit b7b146c9c9a0
("ath9k: fix invalid descriptor discarding") from the wireless tree and
commits 1274603646a8 ("ath9k: move ath9k_process_rate to common.c") and
6438696efa81
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/ath/ath9k/recv.c between commit b7b146c9c9a0
(ath9k: fix invalid descriptor discarding) from the wireless tree and
commits 1274603646a8 (ath9k: move ath9k_process_rate to common.c) and
6438696efa81
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/mwifiex/pcie.c between commit bb8e6a1ee881
("mwifiex: add NULL check for PCIe Rx skb") from the tree and commit
dbccc92b5d54 ("mwifiex: balance dma map/unmap sizes") from the net-next
tree.
I fixed it
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/mwifiex/pcie.c between commit bb8e6a1ee881
(mwifiex: add NULL check for PCIe Rx skb) from the tree and commit
dbccc92b5d54 (mwifiex: balance dma map/unmap sizes) from the net-next
tree.
I fixed it up
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h between commit
db4efbbeb457 ("brcmfmac: obtain platform data upon module
initialization") from the wireless tree and commit 9bd91f3c00bd
("brcm80211: Remove extern from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h between commit
db4efbbeb457 (brcmfmac: obtain platform data upon module
initialization) from the wireless tree and commit 9bd91f3c00bd
(brcm80211: Remove extern from function
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/ibss.c between commit 75a423f493ff ("mac80211: ibss: fix
ignored channel parameter") from the wireless tree and commit
7ca15a0ae865 ("mac80211: allow scanning for 5/10 MHz channels in IBSS")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/ibss.c between commit 75a423f493ff (mac80211: ibss: fix
ignored channel parameter) from the wireless tree and commit
7ca15a0ae865 (mac80211: allow scanning for 5/10 MHz channels in IBSS)
from the net-next tree.
Hi Dave,
On Thu, 4 Apr 2013 11:44:44 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/rt2x00/rt2x00pci.c between commit 69a2bac8984c
> ("rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs") from the
> wireless tree
Hi Dave,
On Thu, 4 Apr 2013 11:44:44 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/rt2x00/rt2x00pci.c between commit 69a2bac8984c
(rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs) from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/rt2x00/rt2x00pci.c between commit 69a2bac8984c
("rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs") from the
wireless tree and commit 1f9061d27d3d ("drivers:net: dma_alloc_coherent:
use __GFP_ZERO
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/rt2x00/rt2x00pci.c between commit 69a2bac8984c
(rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs) from the
wireless tree and commit 1f9061d27d3d (drivers:net: dma_alloc_coherent:
use __GFP_ZERO
Hi John, Stephen,
On Tue, Apr 02, 2013 at 01:00:44PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread:
> Fix build failure due to a new MEI bus API") from the
Hi John, Stephen,
On Tue, Apr 02, 2013 at 01:00:44PM +1100, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/nfc/microread/mei.c between commit 9593b0b1179c (NFC: microread:
Fix build failure due to a new MEI bus API) from the wireless
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread:
Fix build failure due to a new MEI bus API") from the wireless tree and
commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the
net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/nfc/microread/mei.c between commit 9593b0b1179c (NFC: microread:
Fix build failure due to a new MEI bus API) from the wireless tree and
commit 63cd353c34a0 (NFC: microread: Fix MEI build failure) from the
net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/wireless/core.h between commit f9f475292dbb ("cfg80211: always check
for scan end on P2P device") from the wireless tree and commit
812569699119 ("cfg80211/mac80211: disconnect on suspend") from the
net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/sta_info.c between commit 27a737ff7cb0 ("mac80211: always
synchronize_net() during station removal") from the wireless tree and
commit 8d1f7ecd2af5 ("mac80211: defer tailroom counter manipulation when
roaming")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/sta_info.c between commit 27a737ff7cb0 (mac80211: always
synchronize_net() during station removal) from the wireless tree and
commit 8d1f7ecd2af5 (mac80211: defer tailroom counter manipulation when
roaming) from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/wireless/core.h between commit f9f475292dbb (cfg80211: always check
for scan end on P2P device) from the wireless tree and commit
812569699119 (cfg80211/mac80211: disconnect on suspend) from the
net-next tree.
I fixed it
26 matches
Mail list logo
