From: Kalle Valo <kvalo@codeaurora.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-2020-03-25
Date: Thu, 26 Mar 2020 21:38:41 +0200 [thread overview]
Message-ID: <87k1363nzy.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20200326.112927.988175486161491472.davem@davemloft.net> (David Miller's message of "Thu, 26 Mar 2020 11:29:27 -0700 (PDT)")
David Miller <davem@davemloft.net> writes:
> From: Kalle Valo <kvalo@codeaurora.org>
> Date: Thu, 26 Mar 2020 08:19:43 +0200
>
>> David Miller <davem@davemloft.net> writes:
>>
>>> From: Kalle Valo <kvalo@codeaurora.org>
>>> Date: Wed, 25 Mar 2020 19:57:54 +0000 (UTC)
>>>
>>>> here's a pull request to net tree, more info below. Please let me know if there
>>>> are any problems.
>>>
>>> Pulled, thanks Kalle.
>>
>> Thanks. I forgot to remind in this pull request about the iwlwifi
>> conflict when you merge net to net-next. Here are the instructions how
>> to handle that:
>>
>> To solve that just drop the changes from commit cf52c8a776d1 in
>> wireless-drivers and take the hunk from wireless-drivers-next as is.
>> The list of specific subsystem device IDs are not necessary after
>> commit d6f2134a3831 (in wireless-drivers-next) anymore, the detection
>> is based on other characteristics of the devices.
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=5ef8c665416b9815113042e0edebe8ff66a45e2e
>
> I think that's what I did basically, please go take a look and double
> check my work.
Looks good to me, thanks for taking care of it.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2020-03-26 19:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 19:57 pull-request: wireless-drivers-2020-03-25 Kalle Valo
2020-03-25 20:12 ` David Miller
2020-03-26 6:19 ` Kalle Valo
2020-03-26 18:29 ` David Miller
2020-03-26 19:38 ` 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=87k1363nzy.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--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).