From: Kalle Valo <kvalo@codeaurora.org>
To: Luca Coelho <luca@coelho.fi>
Cc: "linux-wireless\@vger.kernel.org"
<linux-wireless@vger.kernel.org>, linuxwifi <linuxwifi@intel.com>
Subject: Re: pull-request: iwlwifi-next 2017-04-13
Date: Tue, 18 Apr 2017 15:30:08 +0300 [thread overview]
Message-ID: <87bmrtc2zz.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1492503743.31741.35.camel@coelho.fi> (Luca Coelho's message of "Tue, 18 Apr 2017 11:22:23 +0300")
Luca Coelho <luca@coelho.fi> writes:
> On Tue, 2017-04-18 at 06:56 +0000, Kalle Valo wrote:
>> Kalle Valo <kvalo@codeaurora.org> writes:
>>
>> > Luca Coelho <luca@coelho.fi> writes:
>> >
>> > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git
>> > > tags/iwlwifi-next-for-kalle-2017-04-13
>> > >
>> > > for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4:
>> > >
>> > > iwlwifi: mvm: separate queue mapping from queue enablement
>> > > (2017-04-11 15:25:00 +0300)
>> > >
>> > > ----------------------------------------------------------------
>> > > Patches intended for v4.12:
>> > >
>> > > * Some small fixes here and there;
>> > > * The usual cleanups and small improvements;
>> > > * Work to support A000 devices continues;
>> > > * New FW API version;
>> > > * Some debugging improvements;
>> > >
>> > > ----------------------------------------------------------------
>> >
>> > This one has few conflicts. I can fix those manually, but can you give
>> > some guidance how?
>>
>> I think I got it now, see below for the diff I did. Can you please
>> check that?
>>
>> The resolution is also in the pending branch:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/log/?h=pending
>
>
> Yes, looks good! Thanks for resolving it and sorry for not foreseeing it
> to give you a heads up.
Good, thanks. I pushed it to master branch now.
--
Kalle Valo
prev parent reply other threads:[~2017-04-18 12:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 12:34 pull-request: iwlwifi-next 2017-04-13 Luca Coelho
2017-04-18 6:34 ` Kalle Valo
2017-04-18 6:56 ` Kalle Valo
2017-04-18 8:22 ` Luca Coelho
2017-04-18 12:30 ` Kalle Valo [this message]
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=87bmrtc2zz.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.