From: Luca Coelho <luca@coelho.fi>
To: Mark Brown <broonie@kernel.org>,
Kalle Valo <kvalo@codeaurora.org>,
Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>,
Shahar S Matityahu <shahar.s.matityahu@intel.com>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Thu, 12 Oct 2017 21:29:39 +0300 [thread overview]
Message-ID: <1507832979.5497.4.camel@coelho.fi> (raw)
In-Reply-To: <20171012172512.tlsdjhppfz2hu4vr@sirena.co.uk>
On Thu, 2017-10-12 at 18:25 +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
> drivers/net/wireless/intel/iwlwifi/iwl-config.h
>
> between commit:
>
> dd05f9aab4426f ("iwlwifi: pcie: dynamic Tx command queue size")
>
> from the wireless-drivers tree and commit:
>
> 44fd09dad5d2b7 ("iwlwifi: nvm: set the correct offsets to 3168
> series")
>
> 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.
>
> diff --cc drivers/net/wireless/intel/iwlwifi/iwl-config.h
> index 71cb1ecde0f7,b9f3b350fe34..000000000000
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
> @@@ -332,7 -320,9 +332,9 @@@ struct iwl_pwr_tx_backoff
> * @integrated: discrete or integrated
> * @gen2: a000 and on transport operation
> * @cdb: CDB support
> - * @ext_nvm: extended NVM format
> + * @nvm_type: see &enum iwl_nvm_type
> + * @tx_cmd_queue_size: size of the cmd queue. If zero, use the same
> value as
> + * the regular queues
> *
> * We enable the driver to be backward compatible wrt. hardware
> features.
> * API differences in uCode shouldn't be handled here but through
> TLVs
> @@@ -382,7 -371,9 +384,8 @@@ struct iwl_cfg
> use_tfh:1,
> gen2:1,
> cdb:1,
> - ext_nvm:1,
nvm_type seems to be missing from here?
> dbgc_supported:1;
> + u16 tx_cmd_queue_size;
> u8 valid_tx_ant;
> u8 valid_rx_ant;
> u8 non_shared_ant;
--
Luca.
next prev parent reply other threads:[~2017-10-12 18:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 17:25 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Mark Brown
2017-10-12 18:16 ` Luciano Coelho
2017-10-12 18:21 ` Mark Brown
2017-10-12 18:27 ` Luciano Coelho
2017-10-12 18:35 ` Mark Brown
2017-10-12 18:50 ` Luca Coelho
2017-10-12 18:59 ` Mark Brown
2017-10-12 19:02 ` Luca Coelho
2017-10-12 18:29 ` Luca Coelho [this message]
2017-10-12 19:12 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2020-03-24 0:16 Stephen Rothwell
2020-03-24 7:00 ` Kalle Valo
2020-03-24 7:29 ` Luca Coelho
2020-03-24 8:07 ` Kalle Valo
2019-10-31 0:13 Stephen Rothwell
2019-10-31 9:36 ` Kalle Valo
2019-04-30 4:08 Stephen Rothwell
2019-04-30 5:30 ` Luciano Coelho
2019-04-15 2:08 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
2019-04-15 2:01 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
2018-04-26 1:09 Stephen Rothwell
2018-04-26 7:38 ` Luciano Coelho
2018-04-26 10:33 ` Kalle Valo
2018-04-26 11:51 ` Luciano Coelho
2017-12-08 1:00 Stephen Rothwell
2017-12-08 12:30 ` Kalle Valo
2017-10-12 17:20 Mark Brown
2017-10-12 17:14 Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507832979.5497.4.camel@coelho.fi \
--to=luca@coelho.fi \
--cc=broonie@kernel.org \
--cc=chaya.rachel.ivgi@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=shahar.s.matityahu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).