From: Kalle Valo <kvalo@codeaurora.org>
To: Luca Coelho <luca@coelho.fi>
Cc: linux-wireless@vger.kernel.org, linuxwifi@intel.com,
david.e.box@intel.com, janet.morgan@intel.com,
joe.konno@intel.com
Subject: Re: pull-request: iwlwifi-next 2017-11-29
Date: Sat, 02 Dec 2017 15:27:20 +0200 [thread overview]
Message-ID: <87h8t9w98n.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1511943359.4827.18.camel@coelho.fi> (Luca Coelho's message of "Wed, 29 Nov 2017 10:15:59 +0200")
Luca Coelho <luca@coelho.fi> writes:
> This is my first batch of patches intended for v4.16. As I mentioned
> in the patchset thread, I removed patch 08/11 because it was broken.
> More details about the contents in the tag description.
>
> I have sent this out before and kbuildbot reported success.
>
> Please let me know if there are any issues.
>
> Cheers,
> Luca.
>
>
> The following changes since commit fdd0bd88ceaecf729db103ac8836af5805dd2dc1:
>
> brcmfmac: add CLM download support (2017-11-11 03:04:09 +0200)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-11-29
>
> for you to fetch changes up to 2f7a3863191afc2c132854b7ffb1b867b4b9e8be:
>
> iwlwifi: rename the temporary name of A000 to the official 22000 (2017-11-28 16:39:57 +0200)
>
> ----------------------------------------------------------------
> First batch of iwlwifi updates for v4.16
>
> * Rename the temporary name A000 to 22000;
> * Change in the way we print the firmware version;
> * Remove some unused code;
> * Other small improvements;
>
> ----------------------------------------------------------------
Pulled, thanks.
But there were few conflicts due to my fast forward from yesterday,
please check my resolution. I tried to be careful that fixes in
c2c48ddfc8b0 ("iwlwifi: fix firmware names for 9000 and A000 series hw")
won't get lost.
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-11-29
>From git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* tag iwlwifi-next-for-kalle-2017-11-29 -> FETCH_HEAD
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-config.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-config.h
Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h
CONFLICT (modify/delete): drivers/net/wireless/intel/iwlwifi/cfg/a000.c deleted in ca495785063c428641cc6df8888afd2587ca6677 and modified in HEAD. Version HEAD of drivers/net/wireless/intel/iwlwifi/cfg/a000.c left in tree.
Recorded preimage for 'drivers/net/wireless/intel/iwlwifi/iwl-config.h'
Automatic merge failed; fix conflicts and then commit the result.
--
Kalle Valo
next prev parent reply other threads:[~2017-12-02 13:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 8:15 pull-request: iwlwifi-next 2017-11-29 Luca Coelho
2017-12-02 13:27 ` Kalle Valo [this message]
2017-12-02 16:08 ` Luca Coelho
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=87h8t9w98n.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=david.e.box@intel.com \
--cc=janet.morgan@intel.com \
--cc=joe.konno@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=luca@coelho.fi \
/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