netdev - Re: pull-request: wireless-drivers-next-2020-08-02

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <87imdyadeg.fsf@tynnyri.adurom.net>
Date:   Tue, 04 Aug 2020 13:55:35 +0300
From:   Kalle Valo <kvalo@...eaurora.org>
To:     Kalle Valo <kvalo@...eaurora.org>
Cc:     David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
        linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next-2020-08-02

Kalle Valo <kvalo@...eaurora.org> writes:

> David Miller <davem@...emloft.net> writes:
>
>> From: Kalle Valo <kvalo@...eaurora.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