From: Kalle Valo <kvalo@codeaurora.org>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2019-04-18
Date: Fri, 19 Apr 2019 06:57:58 +0300 [thread overview]
Message-ID: <87o9521wah.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20190418.111444.1325343486196462539.davem@davemloft.net> (David Miller's message of "Thu, 18 Apr 2019 11:14:44 -0700 (PDT)")
David Miller <davem@davemloft.net> writes:
> From: Kalle Valo <kvalo@codeaurora.org>
> Date: Thu, 18 Apr 2019 16:48:20 +0300
>
>> here's a pull request to net-next for v5.2, more info below. But do note
>> that this time we have two trivial conflicts in iwlwifi, here are
>> Stephen's example resolutions:
>>
>> https://lkml.kernel.org/r/20190415120133.40c0f343@canb.auug.org.au
>>
>> https://lkml.kernel.org/r/20190415120853.39e0e46a@canb.auug.org.au
>>
>> The only change to Stephen's resolution I recommend is to have in drv.c
>> an empty line between group 0x2723 and group 0x1a56, but that's just
>> cosmetic anyway so it doesn't matter really in the end.
>>
>> As always, please do let me know if there any problems.
>
> Pulled, please double check my work.
I checked, your resolution is identical to my test resolution which I
made before sending you the pull request. Next time I'll push my
resolution to my tree so that you can immediately compare them.
Thanks!
--
Kalle Valo
prev parent reply other threads:[~2019-04-19 3:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-18 13:48 pull-request: wireless-drivers-next 2019-04-18 Kalle Valo
2019-04-18 18:14 ` David Miller
2019-04-19 3:57 ` 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=87o9521wah.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--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).