Re: linux-next: build warning after merge of the mac80211-next tree
Hi all,
Just cc'ing the wireless list at Kalle's suggestion.
On Wed, 9 May 2018 14:56:24 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> Hi Johannes,
>
> After merging the mac80211-next tree, today's linux-next build (arm_multi
> v7_defconfig) produced this warning:
>
> drivers/net/wireless/marvell/mwifiex/uap_event.c: In function
> 'mwifiex_process_uap_event':
> drivers/net/wireless/marvell/mwifiex/uap_event.c:333:1: warning: the frame
> size of 1680 bytes is larger than 1024 bytes [-Wframe-larger-than=]
> }
> ^
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function
> 'brcmf_notify_connect_status_ap':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:5530:1: warning:
> the frame size of 1680 bytes is larger than 1024 bytes [-Wframe-larger-than=]
> }
> ^
>
> Maybe introduced by commit
>
> 52539ca89f36 ("cfg80211: Expose TXQ stats and parameters to userspace")
--
Cheers,
Stephen Rothwell
pgpfkukewS8iD.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
between commit:
77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
from the wireless-drivers tree and commits:
9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common files")
4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index ca0174680af9,6d33c14579d9..
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@@ -978,42 -943,302 +990,333 @@@ iwl_parse_nvm_mcc_info(struct device *d
}
regd->n_reg_rules = valid_rules;
+ regd->n_wmm_rules = n_wmms;
- /* set alpha2 from FW. */
- regd->alpha2[0] = fw_mcc >> 8;
- regd->alpha2[1] = fw_mcc & 0xff;
+ /*
+ * Narrow down regdom for unused regulatory rules to prevent hole
+ * between reg rules to wmm rules.
+ */
+ regd_to_copy = sizeof(struct ieee80211_regdomain) +
+ valid_rules * sizeof(struct ieee80211_reg_rule);
+
+ wmms_to_copy = sizeof(struct ieee80211_wmm_rule) * n_wmms;
+
+ copy_rd = kzalloc(regd_to_copy + wmms_to_copy, GFP_KERNEL);
+ if (!copy_rd) {
+ copy_rd = ERR_PTR(-ENOMEM);
+ goto out;
+ }
+
+ memcpy(copy_rd, regd, regd_to_copy);
+ memcpy((u8 *)copy_rd + regd_to_copy, (u8 *)regd + size_of_regd,
+ wmms_to_copy);
+
+ d_wmm = (struct ieee80211_wmm_rule *)((u8 *)copy_rd + regd_to_copy);
+ s_wmm = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);
+
+ for (i = 0; i < regd->n_reg_rules; i++) {
+ if (!regd->reg_rules[i].wmm_rule)
+ continue;
+
+ copy_rd->reg_rules[i].wmm_rule = d_wmm +
+ (regd->reg_rules[i].wmm_rule - s_wmm) /
+ sizeof(struct ieee80211_wmm_rule);
+ }
- return regd;
+out:
+ kfree(regdb_ptrs);
+ kfree(regd);
+ return copy_rd;
}
IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info);
+
+ #define IWL_MAX_NVM_SECTION_SIZE 0x1b58
+ #define IWL_MAX_EXT_NVM_SECTION_SIZE 0x1ffc
+ #define MAX_NVM_FILE_LEN 16384
+
+ void iwl_nvm_fixups(u32 hw_id, unsigned int section, u8 *data,
+ unsigned int len)
+ {
+ #define IWL_4165_DEVICE_ID0x5501
+ #define NVM_SKU_CAP_MIMO_DISABLE BIT(5)
+
+ if (section == NVM_SECTION_TYPE_PHY_SKU &&
+ hw_id == IWL_4165_DEVICE_ID && data && len >= 5 &&
+ (data[4] & NVM_SKU_CAP_MIMO_DISABLE))
+ /* OTP 0x52 bug work around: it's a 1x1 device */
+ data[3] = ANT_B | (ANT_B << 4);
+ }
+ IWL_EXPORT_SYMBOL(iwl_nvm_fixups);
+
+ /*
+ * Reads external NVM from a file into mvm->nvm_sections
+ *
+ * HOW TO CREATE THE NVM FILE FORMAT:
+ * --
+ * 1. create hex file, format:
+ * 3800 -> header
+ * -> header
+ * 5a40 -> data
+ *
+ * rev - 6 bit (word1)
+ * len - 10 bit (word1)
+ * id - 4 bit (word2)
+ * rsv - 12 bit (word2)
+ *
+ * 2. flip 8bits with 8 bits per line to get the right NVM file format
+ *
+ * 3. create binary file from the hex file
+ *
+ * 4. save as "iNVM_xxx.bin" under /lib/firmware
+ */
+ int iwl_read_external_nvm(struct iwl_trans *trans,
+ const char *nvm_file_name,
+ struct iwl_nvm_section *nvm_sections)
+ {
+ int ret, section_size;
+ u16 section_id;
+ const struct firmware *fw_entry;
+ const struct {
+ __le16 word1;
+ __le16 word2;
+ u8 data[];
+ } *file_sec;
+ const u8 *eof;
+ u8 *temp;
+ int max_section_size;
+ const __le32 *dword_buff;
+
+ #define NVM_WORD1_LEN(x) (8 * (x & 0x03FF))
+ #define NVM_WORD2_ID(x) (x >> 12)
+ #define EXT_NVM_WORD2_LEN(x) (2 * (((x) & 0xFF) << 8 | (x) >> 8))
+ #define EXT_NVM_WORD1_ID(x) ((x) >> 4)
+ #define NVM_HEADER_0 (0x2A504C54)
+ #define NVM_HEADER_1 (0x4E564D2A)
+ #define NVM_HEADER_SIZE (4 * sizeof(u32))
+
+ IWL_DEBUG_EEPROM(trans->dev, "Read from external NVM\n");
+
+ /* Maximal size depends on NVM version */
+
linux-next: Signed-off-by missing for commit in the wireless-drivers-next tree
Hi all,
Commit
84226ca1c5d3 ("iwlwifi: mvm: support offload of AMSDU rate control")
is missing a Signed-off-by from its author.
--
Cheers,
Stephen Rothwell
pgpH_8cAXV1iy.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the mac80211-next tree
Hi Johannes,
After merging the mac80211-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/wireless/mediatek/mt76/mt76x2_main.c:539:19: error: initialization
from incompatible pointer type [-Werror=incompatible-pointer-types]
.wake_tx_queue = mt76_wake_tx_queue,
^
drivers/net/wireless/mediatek/mt76/mt76x2_main.c:539:19: note: (near
initialization for 'mt76x2_ops.wake_tx_queue')
Caused by commits
17f1de56df05 ("mt76: add common code shared between multiple chipsets")
7bc04215a66b ("mt76: add driver code for MT76x2e")
from the wireless-drivers-next tree interacting with commit
e937b8da5a59 ("mac80211: Add TXQ scheduling API")
from the mac80211-next tree.
I applied the below hack merge fix ... please let me know if something
more/better is required. Someone needs to remember to tell Dave when
these trees meet in his tree.
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 12 Dec 2017 12:50:40 +1100
Subject: [PATCH] mt76: fix up for "mac80211: Add TXQ scheduling API"
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 2 +-
drivers/net/wireless/mediatek/mt76/tx.c | 10 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h
b/drivers/net/wireless/mediatek/mt76/mt76.h
index aa0880bbea7f..e395d3859212 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -338,7 +338,7 @@ void mt76_tx(struct mt76_dev *dev, struct ieee80211_sta
*sta,
struct mt76_wcid *wcid, struct sk_buff *skb);
void mt76_txq_init(struct mt76_dev *dev, struct ieee80211_txq *txq);
void mt76_txq_remove(struct mt76_dev *dev, struct ieee80211_txq *txq);
-void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq);
+void mt76_wake_tx_queue(struct ieee80211_hw *hw);
void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,
bool send_bar);
void mt76_txq_schedule(struct mt76_dev *dev, struct mt76_queue *hwq);
diff --git a/drivers/net/wireless/mediatek/mt76/tx.c
b/drivers/net/wireless/mediatek/mt76/tx.c
index 4eef69bd8a9e..ad414af0750f 100644
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -463,12 +463,16 @@ void mt76_stop_tx_queues(struct mt76_dev *dev, struct
ieee80211_sta *sta,
}
EXPORT_SYMBOL_GPL(mt76_stop_tx_queues);
-void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq)
+void mt76_wake_tx_queue(struct ieee80211_hw *hw)
{
+ struct ieee80211_txq *txq;
struct mt76_dev *dev = hw->priv;
- struct mt76_txq *mtxq = (struct mt76_txq *) txq->drv_priv;
- struct mt76_queue *hwq = mtxq->hwq;
+ struct mt76_txq *mtxq;
+ struct mt76_queue *hwq;
+ txq = ieee80211_next_txq(hw);
+ mtxq = (struct mt76_txq *) txq->drv_priv;
+ hwq = mtxq->hwq;
spin_lock_bh(>lock);
if (list_empty(>list))
list_add_tail(>list, >swq);
--
2.15.0
--
Cheers,
Stephen Rothwell
linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
between commit:
567deca8e72d ("iwlwifi: add new cards for 9260 and 22000 series")
from the wireless-drivers tree and commit:
2f7a3863191a ("iwlwifi: rename the temporary name of A000 to the official
22000")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index ccd7c33c4c28,5ed89d7ac4b2..
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@@ -652,20 -651,19 +652,20 @@@ static const struct pci_device_id iwl_h
{IWL_PCI_DEVICE(0xA370, 0x4034, iwl9560_2ac_cfg_soc)},
{IWL_PCI_DEVICE(0xA370, 0x40A4, iwl9462_2ac_cfg_soc)},
- /* a000 Series */
- {IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg_hr_cdb)},
- {IWL_PCI_DEVICE(0x34F0, 0x0310, iwla000_2ac_cfg_jf)},
- {IWL_PCI_DEVICE(0x2720, 0x, iwla000_2ax_cfg_hr)},
- {IWL_PCI_DEVICE(0x34F0, 0x0070, iwla000_2ax_cfg_hr)},
- {IWL_PCI_DEVICE(0x2720, 0x0078, iwla000_2ax_cfg_hr)},
- {IWL_PCI_DEVICE(0x2720, 0x0070, iwla000_2ac_cfg_hr_cdb)},
- {IWL_PCI_DEVICE(0x2720, 0x0030, iwla000_2ac_cfg_hr_cdb)},
- {IWL_PCI_DEVICE(0x2720, 0x1080, iwla000_2ax_cfg_hr)},
- {IWL_PCI_DEVICE(0x2720, 0x0090, iwla000_2ac_cfg_hr_cdb)},
- {IWL_PCI_DEVICE(0x2720, 0x0310, iwla000_2ac_cfg_hr_cdb)},
- {IWL_PCI_DEVICE(0x40C0, 0x, iwla000_2ax_cfg_hr)},
- {IWL_PCI_DEVICE(0x40C0, 0x0A10, iwla000_2ax_cfg_hr)},
- {IWL_PCI_DEVICE(0xA0F0, 0x, iwla000_2ax_cfg_hr)},
+ /* 22000 Series */
+ {IWL_PCI_DEVICE(0x2720, 0x0A10, iwl22000_2ac_cfg_hr_cdb)},
+ {IWL_PCI_DEVICE(0x34F0, 0x0310, iwl22000_2ac_cfg_jf)},
+ {IWL_PCI_DEVICE(0x2720, 0x, iwl22000_2ax_cfg_hr)},
+ {IWL_PCI_DEVICE(0x34F0, 0x0070, iwl22000_2ax_cfg_hr)},
+ {IWL_PCI_DEVICE(0x2720, 0x0078, iwl22000_2ax_cfg_hr)},
+ {IWL_PCI_DEVICE(0x2720, 0x0070, iwl22000_2ac_cfg_hr_cdb)},
+ {IWL_PCI_DEVICE(0x2720, 0x0030, iwl22000_2ac_cfg_hr_cdb)},
+ {IWL_PCI_DEVICE(0x2720, 0x1080, iwl22000_2ax_cfg_hr)},
+ {IWL_PCI_DEVICE(0x2720, 0x0090, iwl22000_2ac_cfg_hr_cdb)},
+ {IWL_PCI_DEVICE(0x2720, 0x0310, iwl22000_2ac_cfg_hr_cdb)},
+ {IWL_PCI_DEVICE(0x40C0, 0x, iwl22000_2ax_cfg_hr)},
+ {IWL_PCI_DEVICE(0x40C0, 0x0A10, iwl22000_2ax_cfg_hr)},
++ {IWL_PCI_DEVICE(0xA0F0, 0x, iwl22000_2ax_cfg_hr)},
#endif /* CONFIG_IWLMVM */
Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Hi all, On Thu, 24 Aug 2017 11:17:53 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > IWL_DEBUG_DEV(dev, IWL_DL_LAR, > - "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x) > reg_flags 0x%x: %s\n", > - "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x): > %s\n", > ++ "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) > reg_flags 0x%x: %s\n" Rats! I missed the comma ... I have added it back. -- Cheers, Stephen Rothwell
Re: pull-request: iwlwifi-next 2017-08-18
Hi Kalle, On Wed, 23 Aug 2017 18:21:51 +0300 Kalle Valo <kv...@codeaurora.org> wrote: > > Luca Coelho <l...@coelho.fi> writes: > > > Here's my third pull-request intended for v4.14. We continued doing > > generic development work, with improvements, bug fixes and cleanups all > > around. More details in the tag description. > > > > My patch "iwlwifi: update channel flags parser" is going to cause a > > conflict with net because they both change the same string in debug > > message. Emmanuel's patch "iwlwifi: split the regulatory rules when the > > bandwidth flags require it" added "reg_flags" to the string and changed > > the Ad-hoc string. My patch added a few %s's and also changed the Ad- > > hoc string. The result of the conflict resolution should look like > > this: > > > > "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n" > > Thanks, I'll Cc Stephen because he most probably sees that conflict > tomorrow. Thanks for the heads up ... -- Cheers, Stephen Rothwell
linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
between commit:
a600852a9d00 ("iwlwifi: mvm: don't WARN when a legit race happens in A-MPDU")
from Linus' tree and commit:
790e663433d8 ("iwlwifi: mvm: include more debug data when we get an
unexpected baid")
from the wireless-drivers-next tree.
I fixed it up (I just used the former) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/intel/iwlwifi/mvm/rs.c
between commit:
87f55616f81b ("iwlwifi: mvm: rs: fix TLC statistics collection")
from Linus' tree and commit:
482e48440a0e ("iwlwifi: mvm: change open and close criteria of a BA session")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rs.c
index 8999a1199d60,44c873082a31..
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@@ -1312,7 -1357,8 +1357,8 @@@ void iwl_mvm_rs_tx_status(struct iwl_mv
if (info->status.ampdu_ack_len == 0)
info->status.ampdu_len = 1;
- rs_collect_tlc_data(mvm, lq_sta, curr_tbl, tx_resp_rate.index,
+ rs_collect_tlc_data(mvm, mvmsta, tid, curr_tbl,
- lq_rate.index,
++ tx_resp_rate.index,
info->status.ampdu_len,
info->status.ampdu_ack_len);
@@@ -1348,11 -1394,11 +1394,11 @@@
continue;
rs_collect_tpc_data(mvm, lq_sta, tmp_tbl,
- lq_rate.index, 1,
+ tx_resp_rate.index, 1,
i < retries ? 0 : legacy_success,
reduced_txp);
- rs_collect_tlc_data(mvm, lq_sta, tmp_tbl,
+ rs_collect_tlc_data(mvm, mvmsta, tid, tmp_tbl,
- lq_rate.index, 1,
+ tx_resp_rate.index, 1,
i < retries ? 0 : legacy_success);
}
linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Hi all,
As expetced, today's linux-next merge of the wireless-drivers-next tree
got a conflict in:
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
between commit:
92b0f7b26b31 ("iwlwifi: split the regulatory rules when the bandwidth flags
require it")
from Linus' tree and commit:
b823cf3bae81 ("iwlwifi: update channel flags parser")
from the wireless-drivers-next tree.
I fixed it up (see below - Luca, Kalle, thanks for the heads up) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 3ee6767392b6,aa382f719988..
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@@ -864,11 -908,11 +911,11 @@@ iwl_parse_nvm_mcc_info(struct device *d
rule->flags |= NL80211_RRF_AUTO_BW;
rule->freq_range.max_bandwidth_khz = 0;
- prev_ch_flags = ch_flags;
prev_center_freq = center_freq;
+ prev_reg_rule_flags = reg_rule_flags;
IWL_DEBUG_DEV(dev, IWL_DL_LAR,
- "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x)
reg_flags 0x%x: %s\n",
-"Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x):
%s\n",
++"Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x)
reg_flags 0x%x: %s\n"
center_freq,
band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
CHECK_AND_PRINT_I(VALID),
@@@ -878,9 -926,8 +929,8 @@@
CHECK_AND_PRINT_I(40MHZ),
CHECK_AND_PRINT_I(80MHZ),
CHECK_AND_PRINT_I(160MHZ),
- CHECK_AND_PRINT_I(INDOOR_ONLY),
- CHECK_AND_PRINT_I(GO_CONCURRENT),
+ CHECK_AND_PRINT_I(DC_HIGH),
-ch_flags,
+ch_flags, reg_rule_flags,
((ch_flags & NVM_CHANNEL_ACTIVE) &&
!(ch_flags & NVM_CHANNEL_RADAR))
? "Ad-Hoc" : "");
Re: Adding nfc-next to linux-next
Hi Samuel, On Wed, 28 Jun 2017 09:25:31 +0200 Samuel Ortiz <sa...@linux.intel.com> wrote: > > Could you please add the nfc-next tree to linux-next? > > It's here: > > https://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git/ > > and the branch is the master one. Added from today. Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgement of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
linux-next: build warning after merge of the wireless-drivers tree
Hi all,
After merging the wireless-drivers tree, today's linux-next build
(x86_64 allmodconfig) produced this warning:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
'brcmf_usb_probe_phase2':
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2: warning:
'devinfo' may be used uninitialized in this function [-Wmaybe-uninitialized]
mutex_unlock(>dev_init_lock);
^
Introduced by commit
6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware
callback")
--
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the wireless-drivers-next tree
Hi Dave,
On Thu, 15 Jun 2017 12:08:08 -0400 (EDT) David Miller <da...@davemloft.net>
wrote:
>
> From: Stephen Rothwell <s...@canb.auug.org.au>
> Date: Tue, 13 Jun 2017 12:00:24 +1000
>
> > On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <s...@canb.auug.org.au>
> > wrote:
> >>
> >> After merging the wireless-drivers-next tree, today's linux-next build
> >> (x86_64 allmodconfig) failed like this:
> >>
> >> drivers/net/wireless/quantenna/qtnfmac/core.c: In function
> >> 'qtnf_core_net_attach':
> >> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct
> >> net_device' has no member named 'destructor'
> >> dev->destructor = free_netdev;
> >> ^
> >>
> >> Caused by commit
> >>
> >> 98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna
> >> chipsets")
> >
> > This commit is now in the net-next tree ...
> >
> >> interacting with commit
> >>
> >> cf124db566e6 ("net: Fix inconsistent teardown and release of private
> >> netdev state.")
> >>
> >> from the net tree.
> >>
> >> I applied this merge fix patch for today.
> >
> > So this merge fix patch is needed when the net and net-next trees are
> > merged.
>
> This is now all resolved, thanks!
Thanks for letting me know.
--
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the wireless-drivers-next tree
Hi Dave,
On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
>
> drivers/net/wireless/quantenna/qtnfmac/core.c: In function
> 'qtnf_core_net_attach':
> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct
> net_device' has no member named 'destructor'
> dev->destructor = free_netdev;
> ^
>
> Caused by commit
>
> 98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna
> chipsets")
This commit is now in the net-next tree ...
> interacting with commit
>
> cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev
> state.")
>
> from the net tree.
>
> I applied this merge fix patch for today.
So this merge fix patch is needed when the net and net-next trees are merged.
> From: Stephen Rothwell <s...@canb.auug.org.au>
> Date: Thu, 8 Jun 2017 12:24:08 +1000
> Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
> release of private netdev state."
>
> Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
> ---
> drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c
> b/drivers/net/wireless/quantenna/qtnfmac/core.c
> index c5ac252464f4..f053532c0e87 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/core.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
> @@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct
> qtnf_vif *vif,
> vif->netdev = dev;
>
> dev->netdev_ops = _netdev_ops;
> - dev->destructor = free_netdev;
> + dev->needs_free_netdev = true;
> dev_net_set(dev, wiphy_net(wiphy));
> dev->ieee80211_ptr = >wdev;
> dev->ieee80211_ptr->iftype = iftype;
> --
> 2.11.0
--
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the wireless-drivers-next tree
Hi Kalle, On Thu, 08 Jun 2017 15:07:00 +0300 Kalle Valo <kv...@codeaurora.org> wrote: > > Stephen Rothwell <s...@canb.auug.org.au> writes: > > > On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko > > <igor.mitsyanko...@quantenna.com> wrote: > >> > >> thanks. As I understand, you've applied this patch during a merge and no > >> further actions are required, correct? > > > > Dave Miller will need to apply that patch (or something similar) when > > he merges the wireless-drivers-next tree into the net-next tree. I > > will keep applying the patch each day until then. > > Thanks, I'll remind Dave about this when i submit the pull request (very > soon now). It occurred to me just after I wrote the previous message that it would only be true after he merges the current net tree into the net-next tree. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the wireless-drivers-next tree
Hi Igor, On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko...@quantenna.com> wrote: > > thanks. As I understand, you've applied this patch during a merge and no > further actions are required, correct? Dave Miller will need to apply that patch (or something similar) when he merges the wireless-drivers-next tree into the net-next tree. I will keep applying the patch each day until then. -- Cheers, Stephen Rothwell
linux-next: build failure after merge of the wireless-drivers-next tree
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) failed like this:
drivers/net/wireless/quantenna/qtnfmac/core.c: In function
'qtnf_core_net_attach':
drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device'
has no member named 'destructor'
dev->destructor = free_netdev;
^
Caused by commit
98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")
interacting with commit
cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev
state.")
from the net tree.
I applied this merge fix patch for today.
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Thu, 8 Jun 2017 12:24:08 +1000
Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
release of private netdev state."
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c
b/drivers/net/wireless/quantenna/qtnfmac/core.c
index c5ac252464f4..f053532c0e87 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/core.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
@@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct
qtnf_vif *vif,
vif->netdev = dev;
dev->netdev_ops = _netdev_ops;
- dev->destructor = free_netdev;
+ dev->needs_free_netdev = true;
dev_net_set(dev, wiphy_net(wiphy));
dev->ieee80211_ptr = >wdev;
dev->ieee80211_ptr->iftype = iftype;
--
2.11.0
--
Cheers,
Stephen Rothwell
Re: [PATCH] staging: rtl8723bs: Add missing include to fix compile error
Hi Hans,
On Mon, 10 Apr 2017 21:13:07 +0200 Hans de Goede <hdego...@redhat.com> wrote:
>
> As reported by Stephen Rothwell when merging staging-next,
> drivers/staging/rtl8723bs/core/rtw_ieee80211.c does not compile due
> to of_get_property not being declared.
>
> Explicitly include to fix this compile error.
>
> Cc: Stephen Rothwell <s...@canb.auug.org.au>
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> index af44a8c..74f5ee0 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> @@ -16,7 +16,7 @@
>
> #include
> #include
> -
> +#include
>
> u8 RTW_WPA_OUI_TYPE[] = { 0x00, 0x50, 0xf2, 1 };
> u16 RTW_WPA_VERSION = 1;
> --
> 2.9.3
I will add this to linux-next today.
--
Cheers,
Stephen Rothwell
linux-next: build warning after merge of the wireless-drivers-next tree
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) produced this warning:
drivers/net/wireless/marvell/mwifiex/pcie.c: In function 'mwifiex_pcie_remove':
drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status' may be
used uninitialized in this function [-Wmaybe-uninitialized]
if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {
^
Introduced by commit
045f0c1b5e26 ("mwifiex: get rid of global user_rmmod flag")
This is not a false positive since "reg" could be NULL just above
(otherwise it would be tested for).
--
Cheers,
Stephen Rothwell
linux-next: manual merge of the wireless-drivers-next tree with the net-next tree
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/ath/ath10k/mac.c
between commit:
f3fe4e93dd63 ("mac80211: add a HW flag for supporting HW TX fragmentation")
from the net-next tree and commit:
ff32eeb86aa1 ("ath10k: advertize hardware packet loss mechanism")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/ath/ath10k/mac.c
index 717b2fad9a8a,db6ddf974d1d..
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -8005,7 -7993,7 +7993,8 @@@ int ath10k_mac_register(struct ath10k *
ieee80211_hw_set(ar->hw, WANT_MONITOR_VIF);
ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
+ ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);
+ ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK);
if (!test_bit(ATH10K_FLAG_RAW_MODE, >dev_flags))
ieee80211_hw_set(ar->hw, SW_CRYPTO_CONTROL);
linux-next: build warning after merge of the wireless-drivers-next tree
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) produced this warning:
In file included from include/linux/usb/ch9.h:35:0,
from include/linux/usb.h:5,
from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c:32:
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c: In function
'rtl8xxxu_fill_txdesc_v2':
include/linux/device.h:1214:36: warning: 'rate' may be used uninitialized in
this function [-Wmaybe-uninitialized]
#define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg)
^
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c:4841:6: note: 'rate' was
declared here
u32 rate;
^
Introduced by commit
b4c3d9cfb607 ("rtl8xxxu: Pass tx_info to fill_txdesc in order to have access
to retry count")
This is a correct diagnosis.
--
Cheers,
Stephen Rothwell
linux-next: manual merge of the l2-mtd tree with the wireless-drivers-next tree
Hi Brian,
Today's linux-next merge of the l2-mtd tree got a conflict in:
drivers/mtd/devices/Kconfig
between commit:
efacc699139e ("mtd: add arch dependency for MTD_BCM47XXSFLASH symbol")
from the wireless-drivers-next tree and commit:
0a526341fee0 ("mtd: update description of MTD_BCM47XXSFLASH symbol")
from the l2-mtd tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/mtd/devices/Kconfig
index 64a248556d29,bf8238fb2e12..
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@@ -113,8 -113,8 +113,8 @@@ config MTD_SST25
if you want to specify device partitioning.
config MTD_BCM47XXSFLASH
- tristate "R/O support for serial flash on BCMA bus"
+ tristate "Support for serial flash on BCMA bus"
- depends on BCMA_SFLASH
+ depends on BCMA_SFLASH && (MIPS || ARM)
help
BCMA bus can have various flash memories attached, they are
registered by bcma as platform devices. This enables driver for
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: build failure after merge of the wireless-drivers-next tree
Hi Brian, On Tue, 19 Jul 2016 11:39:13 -0700 Brian Norris <computersforpe...@gmail.com> wrote: > > I applied a trivial change to this same Kconfig entry: > > Subject: mtd: update description of MTD_BCM47XXSFLASH symbol > http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c > > It's a trivial conflict, so should we just let Linus work it out? I can > note it my MTD pull request, if wireless lands first. Linus and I should be able to cope. I will send my usual notification today. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-next: build failure after merge of the wireless-drivers-next tree
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:
drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of
function 'ioremap_cache' [-Werror=implicit-function-declaration]
b47s->window = ioremap_cache(res->start, resource_size(res));
^
drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer
from integer without a cast [-Wint-conversion]
b47s->window = ioremap_cache(res->start, resource_size(res));
^
Caused by commit
57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-next: manual merge of the wireless-drivers-next tree with the net-next tree
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
between commit:
7947d3e075cd ("mac80211: Add support for beacon report radio measurement")
from the net-next tree and commit:
69e046423ad7 ("iwlwifi: mvm: change scan timeout to a delayed work")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 1cac10c5d818,fb25d9e41912..
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@@ -400,9 -396,10 +400,9 @@@ void iwl_mvm_rx_lmac_scan_complete_noti
iwl_mvm_ebs_status_str(scan_notif->ebs_status));
mvm->scan_status &= ~IWL_MVM_SCAN_REGULAR;
- ieee80211_scan_completed(mvm->hw,
- scan_notif->status == IWL_SCAN_OFFLOAD_ABORTED);
+ ieee80211_scan_completed(mvm->hw, );
iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
- del_timer(>scan_timer);
+ cancel_delayed_work(>scan_timeout_dwork);
} else {
IWL_ERR(mvm,
"got scan complete notification but no scan is
running\n");
@@@ -1433,13 -1432,9 +1435,13 @@@ void iwl_mvm_rx_umac_scan_complete_noti
/* if the scan is already stopping, we don't need to notify mac80211 */
if (mvm->scan_uid_status[uid] == IWL_MVM_SCAN_REGULAR) {
- ieee80211_scan_completed(mvm->hw, aborted);
+ struct cfg80211_scan_info info = {
+ .aborted = aborted,
+ };
+
+ ieee80211_scan_completed(mvm->hw, );
iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
- del_timer(>scan_timer);
+ cancel_delayed_work(>scan_timeout_dwork);
} else if (mvm->scan_uid_status[uid] == IWL_MVM_SCAN_SCHED) {
ieee80211_sched_scan_stopped(mvm->hw);
mvm->sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED;
@@@ -1644,14 -1630,9 +1646,14 @@@ out
* to release the scan reference here.
*/
iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
- del_timer(>scan_timer);
+ cancel_delayed_work(>scan_timeout_dwork);
- if (notify)
- ieee80211_scan_completed(mvm->hw, true);
+ if (notify) {
+ struct cfg80211_scan_info info = {
+ .aborted = true,
+ };
+
+ ieee80211_scan_completed(mvm->hw, );
+ }
} else if (notify) {
ieee80211_sched_scan_stopped(mvm->hw);
mvm->sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED;
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: build warning after merge of the wireless-drivers-next tree
Hi all,
On Fri, 8 Jul 2016 11:32:14 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> After merging the wireless-drivers-next tree, today's linux-next build
> (arm multi_v7_defconfig, x86_64 allmodconfig) produced this warning:
>
> drivers/net/wireless/marvell/mwifiex/scan.c: In function
> 'mwifiex_cancel_scan':
> drivers/net/wireless/marvell/mwifiex/scan.c:2031:44: warning: passing
> argument 2 of 'cfg80211_scan_done' makes pointer from integer without a cast
> [-Wint-conversion]
> cfg80211_scan_done(priv->scan_request, 1);
> ^
> In file included from include/net/mac80211.h:23:0,
> from drivers/net/wireless/marvell/mwifiex/decl.h:30,
> from drivers/net/wireless/marvell/mwifiex/scan.c:20:
> include/net/cfg80211.h:4104:6: note: expected 'struct cfg80211_scan_info *'
> but argument is of type 'int'
> void cfg80211_scan_done(struct cfg80211_scan_request *request,
> ^
>
> Introduced by commit
>
> a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan")
>
> interacting with commit
>
> 1d76250bd34a ("nl80211: support beacon report scanning")
>
> from the net-next (and mac80211-next) tree.
>
> This will need some merge fix patch ... please send me or Dave one.
Of course, this is the conflict I reported against the mac80211-next
tree yesterday (the memory fades :-)) ... I will move the merge fix
patch from that tree to this one.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-next: build warning after merge of the wireless-drivers-next tree
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(arm multi_v7_defconfig, x86_64 allmodconfig) produced this warning:
drivers/net/wireless/marvell/mwifiex/scan.c: In function 'mwifiex_cancel_scan':
drivers/net/wireless/marvell/mwifiex/scan.c:2031:44: warning: passing argument
2 of 'cfg80211_scan_done' makes pointer from integer without a cast
[-Wint-conversion]
cfg80211_scan_done(priv->scan_request, 1);
^
In file included from include/net/mac80211.h:23:0,
from drivers/net/wireless/marvell/mwifiex/decl.h:30,
from drivers/net/wireless/marvell/mwifiex/scan.c:20:
include/net/cfg80211.h:4104:6: note: expected 'struct cfg80211_scan_info *' but
argument is of type 'int'
void cfg80211_scan_done(struct cfg80211_scan_request *request,
^
Introduced by commit
a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan")
interacting with commit
1d76250bd34a ("nl80211: support beacon report scanning")
from the net-next (and mac80211-next) tree.
This will need some merge fix patch ... please send me or Dave one.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree
Hi Kalle, On Thu, 07 Jul 2016 19:10:24 +0300 Kalle Valo <kv...@codeaurora.org> wrote: > > Stephen, if it's not too much trouble for you it would be good to CC > linux-wireless on wireless related problems. Not everyone follow lkml > (or linux-next). I have added linux-wireless@vger.kernel.org as a contact for the wireless-drivers and wireless-drivers-next trees. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next inclusion request for mac80211
Hi Johannes,
On Tue, 17 Nov 2015 16:14:12 +0100 Johannes Berg <johan...@sipsolutions.net>
wrote:
>
> Could you please add my mac80211 and mac80211-next trees, found at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
>
> with their 'master' branches to linux-next?
>
> These trees are feeding net and net-next respectively, but I don't
> always send them immediately and it'd be good to have early integration
> with other things happening elsewhere, in particular of course with the
> wifi drivers found in wireless-drivers{,-next}.
Added from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: randconfig build error with next-20150303, in drivers/bcma/driver_pcie2.c
Hi Kalle, On Wed, 04 Mar 2015 16:31:00 +0200 Kalle Valo kv...@codeaurora.org wrote: Jim Davis jim.ep...@gmail.com writes: Building with the attached random configuration file, drivers/bcma/driver_pcie2.c: In function 'bcma_core_pcie2_up': drivers/bcma/driver_pcie2.c:196:2: error: implicit declaration of function 'pcie_set_readrq' [-Werror=implicit-function-declaration] err = pcie_set_readrq(dev, pcie2-reqsize); ^ This should fix it: bcma: add missing includes https://git.kernel.org/cgit/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=2264fc857decd45798368f46861d9aecac23546f However, that commit is in next-20150304 and we still get the error (see, for example, http://kisskb.ellerman.id.au/kisskb/buildresult/12376688/). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgptkI9Uoc1PO.pgp Description: OpenPGP digital signature
