From: Kalle Valo <kvalo@codeaurora.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-next-2020-08-02
Date: Tue, 04 Aug 2020 13:55:35 +0300 [thread overview]
Message-ID: <87imdyadeg.fsf@tynnyri.adurom.net> (raw)
In-Reply-To: <87r1sncavb.fsf@codeaurora.org> (Kalle Valo's message of "Tue, 04 Aug 2020 07:07:20 +0300")
Kalle Valo <kvalo@codeaurora.org> writes:
> David Miller <davem@davemloft.net> writes:
>
>> From: Kalle Valo <kvalo@codeaurora.org>
>> Date: Sun, 2 Aug 2020 19:01:36 +0000 (UTC)
>>
>>> here's a pull request to net-next tree, more info below. Please let me know if
>>> there are any problems.
>>
>> There are many several non-trivial mt76 conflicts, can you please sort
>> this out and send me another pull request?
>
> Yeah, I noticed the same and I tried to explain how to fix those in the
> signed tag:
>
> ----------------------------------------------------------------------
> This pull request causes conflicts in four files in
> drivers/net/wireless/mediatek/mt76/mt7615/, here is how I fixed those:
>
> * usb.c: take the hunk which uses mt7663_usb_sdio_tx_*() functions
>
> * mt7615.h: remove either one of the duplicate (and identical) enum tx_pkt_queue_idx
>
> * mt7615.h: take the hunk which has mt7615_mutex_acquire/release() functions
>
> * main.c: take the hunk which uses mt7615_mutex_acquire/release()
>
> * mac.c: take the hunk which uses is_mmio
> ----------------------------------------------------------------------
>
> By following those instructions it shouldn't take more than few minutes
> to fix the conflicts.
>
> Or would you prefer that I fix those differently, for example by pulling
> net-next to wireless-drivers-next before I send the pull request? Just
> let me know what you prefer.
After thinking a bit more I realised that the easiest is that if I merge
wireless-drivers to wireles-drivers-next and fix the conflict then, and
after that send you a new pull request.
So please drop this pull request, I'll send you a new one shortly.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2020-08-04 10:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-02 19:01 pull-request: wireless-drivers-next-2020-08-02 Kalle Valo
2020-08-03 23:18 ` David Miller
2020-08-04 4:07 ` Kalle Valo
2020-08-04 10:55 ` 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=87imdyadeg.fsf@tynnyri.adurom.net \
--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).