linux-kernel - Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next 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]

Date:	Mon, 11 Jul 2016 11:03:24 +0300
From:	Kalle Valo <kvalo@...eaurora.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	<linux-wireless@...r.kernel.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Avraham Stern <avraham.stern@...el.com>,
	Johannes Berg <johannes.berg@...el.com>,
	Assaf Krauss <assaf.krauss@...el.com>,
	Luca Coelho <luciano.coelho@...el.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next 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/scan.c
>
> between commit:
>
>   7947d3e075cd ("mac80211: Add support for beacon report radio measurement")
>
> from the net-next tree and commit:
>
>   69e046423ad7 ("iwlwifi: mvm: change scan timeout to a delayed work")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks. I'm planning to submit a pull request to Dave tomorrow and I'll
include instruction how to solve these mac80211 API conflicts.

-- 
Kalle Valo