linux-kernel - Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

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: <87pnid1cl0.fsf@kamboji.qca.qualcomm.com>
Date:   Thu, 31 Oct 2019 11:36:11 +0200
From:   Kalle Valo <kvalo@...eaurora.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Wireless <linux-wireless@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ayala Beker <ayala.beker@...el.com>,
        Tova Mussai <tova.mussai@...el.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
>
> between commit:
>
>   3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd")
>
> from the wireless-drivers tree and commit:
>
>   65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu")
>
> from the wireless-drivers-next tree.

Thanks, the resolution looked simple enough so I'm not taking any extra
actions because of this (for example merging wireless-drivers to
wireless-drivers-next etc).

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches