From: Kalle Valo <kvalo@codeaurora.org>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
luciano.coelho@intel.com, emmanuel.grumbach@intel.com
Subject: Re: pull-request: wireless-drivers-next 2016-05-13
Date: Tue, 17 May 2016 09:43:34 +0300 [thread overview]
Message-ID: <8737ph89rd.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <87futi858q.fsf@kamboji.qca.qualcomm.com> (Kalle Valo's message of "Mon, 16 May 2016 17:08:53 +0300")
Hi Dave,
Kalle Valo <kvalo@codeaurora.org> writes:
> Kalle Valo <kvalo@codeaurora.org> writes:
>
>> Kalle Valo <kvalo@codeaurora.org> writes:
>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git tags/wireless-drivers-next-for-davem-2016-05-13
>>
>> Please don't pull this yet, there might be something wrong now with
>> merges and need to check that first.
>
> Ok, like discussed in thread "linux-next: manual merge of the
> wireless-drivers-next tree with the net-next tree" there seems to be a
> problem on net-next in function iwl_mvm_set_tx_cmd(). Here is how I
> propose to fix this.
I noticed that you had marked this as Superseded in pathwork[1]. I was
actually hoping that you would pull this with the instructions how to
fix the conflict. But do you actually want me to resubmit the pull
request? Or something else?
[1] https://patchwork.ozlabs.org/patch/621953/
--
Kalle Valo
next prev parent reply other threads:[~2016-05-17 6:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-13 11:31 pull-request: wireless-drivers-next 2016-05-13 Kalle Valo
2016-05-16 13:16 ` Kalle Valo
2016-05-16 14:08 ` Kalle Valo
2016-05-16 18:11 ` Coelho, Luciano
2016-05-17 6:43 ` Kalle Valo [this message]
2016-05-17 16:21 ` David Miller
2016-05-17 17:12 ` Kalle Valo
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=8737ph89rd.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
/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).