[lkml]   [2016]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the wireless-drivers-next tree with the net-next tree
Stephen Rothwell <> 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

 \ /
  Last update: 2016-07-11 10:41    [W:0.058 / U:11.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site