lkml.org 
[lkml]   [2016]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: pull-request: wireless-drivers-next 2016-07-13
From
From: Kalle Valo <kvalo@codeaurora.org>
Date: Wed, 13 Jul 2016 21:29:13 +0300

> here's a pull request for net-next. This time there are few conflicts
> due to the cfg80211 scan API changes, and one of them is easy to miss,
> so please pay extra attention to them. Otherwise there's not nothing
> really out of ordinary. Please note that I also pulled wireless-drivers
> to wireless-drivers-next to reduce the amount of conflicts.
>
> So about the conflicts, the obvious are notified by git:
...
> I have attached the output from git diff as an example how to resolve
> this, hopefully that helps. Please let me know if there are any problems
> or if you want to handle these differently.

Thanks for all of the conflict resolution info, it really helped.

I pushed this all out, please double check my work.

Thanks.

\
 
 \ /
  Last update: 2016-07-15 03:21    [W:0.082 / U:1.380 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site