Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1443993

Re: pull-request: wireless-drivers-next 2016-07-13

Show all headers | View raw

David Miller <davem@davemloft.net> writes:

> 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.

Looks good, thanks!

-- 
Kalle Valo

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

pull-request: wireless-drivers-next 2016-07-13 Kalle Valo <kvalo@codeaurora.org> - 2016-07-13 20:40 +0200
  Re: pull-request: wireless-drivers-next 2016-07-13 David Miller <davem@davemloft.net> - 2016-07-15 02:50 +0200
    Re: pull-request: wireless-drivers-next 2016-07-13 Kalle Valo <kvalo@codeaurora.org> - 2016-07-15 09:30 +0200

csiph-web