Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1718746 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-08-24 03:20 +0200 |
| Last post | 2017-08-24 09:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-24 03:20 +0200
Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-24 03:40 +0200
Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Kalle Valo <kvalo@codeaurora.org> - 2017-08-24 09:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-08-24 03:20 +0200 |
| Subject | linux-next: manual merge of the wireless-drivers-next tree with Linus' tree |
| Message-ID | <uhOYp-84n-1@gated-at.bofh.it> |
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..000000000000
--- 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" : "");
[toc] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-08-24 03:40 +0200 |
| Message-ID | <uhPhL-8aO-5@gated-at.bofh.it> |
| In reply to | #1718746 |
Hi all, On Thu, 24 Aug 2017 11:17:53 +1000 Stephen Rothwell <sfr@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
[toc] | [prev] | [next] | [standalone]
| From | Kalle Valo <kvalo@codeaurora.org> |
|---|---|
| Date | 2017-08-24 09:50 +0200 |
| Subject | Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree |
| Message-ID | <uhV3P-3x1-11@gated-at.bofh.it> |
| In reply to | #1718746 |
(Adding Dave so that he is also aware of this)
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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.
Thanks for the report. There were quite a few conflicts in iwlwifi so
I'm planning to merge wireless-drivers to wireless-drivers-next today so
that the conflicts are fixed before I submit them to Dave.
--
Kalle Valo
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web