[PATCH 08/10] nl80211_driver: implement init and deinit P2P device functions

[Arend van Spriel]

On 02/19/2013 12:08 PM, Spinadel, David wrote:
> Oh, sent it with [PATCH 1/3] instead of [PATCH 08/10] etc.
> Can you please just check it if it can be applied?

I actually skipped patch 8/10 and patch 9 and 10 applied fine. So I
applied patch 1/3 after that and did an interactive rebase to get them
back in the correct order. So I am fine now.

Regards,
Arend

> Thanks,
> David 
> 
>> -----Original Message-----
>> From: hostap-bounces at lists.shmoo.com [mailto:hostap-
>> bounces at lists.shmoo.com] On Behalf Of Spinadel, David
>> Sent: Tuesday, February 19, 2013 12:33
>> To: Arend van Spriel; dvdspndl at gmail.com
>> Cc: hostap at lists.shmoo.com
>> Subject: RE: [PATCH 08/10] nl80211_driver: implement init and deinit P2P
>> device functions
>>
>> Strange, I'll try to send again.
>>
>> David
>>
>>> -----Original Message-----
>>> From: hostap-bounces at lists.shmoo.com [mailto:hostap-
>>> bounces at lists.shmoo.com] On Behalf Of Arend van Spriel
>>> Sent: Tuesday, February 19, 2013 11:37
>>> To: dvdspndl at gmail.com
>>> Cc: hostap at lists.shmoo.com
>>> Subject: Re: [PATCH 08/10] nl80211_driver: implement init and deinit
>>> P2P device functions
>>>
>>> On 02/18/2013 09:30 PM, dvdspndl at gmail.com wrote:
>>>> From: David Spinadel <david.spinadel at intel.com>
>>>>
>>>> Signed-off-by: David Spinadel <david.spinadel at intel.com>
>>>> ---
>>>>  src/drivers/driver_nl80211.c |  138
>>>> ++++++++++++++++++++++++++++++++++++++++++
>>>>  1 file changed, 138 insertions(+)
>>>>
>>>> diff --git a/src/drivers/driver_nl80211.c
>>>> b/src/drivers/driver_nl80211.c index bf53ce4..4a2c87d 100644
>>>> --- a/src/drivers/driver_nl80211.c
>>>> +++ b/src/drivers/driver_nl80211.c
>>>
>>> Hi David,
>>>
>>> I tried to apply your patches in my hostap repo, but it failed on this
>>> patch when using 'git am -3':
>>>
>>> Applying: nl80211_driver: implement init and deinit P2P device
>>> functions
>>> fatal: sha1 information is lacking or useless (src/drivers/driver_nl80211.c).
>>> Repository lacks necessary blobs to fall back on 3-way merge.
>>> Cannot fall back to three-way merge.
>>> Patch failed at 0008 nl80211_driver: implement init and deinit P2P
>>> device functions
>>>
>>> This was done on top of the following commit:
>>>
>>> b618a469c42120e984ab1c85ed6058504d1fca78
>>> Author: Jouni Malinen <jouni at qca.qualcomm.com>
>>> Date:   Sat Feb 16 19:54:09 2013 +0200
>>>
>>>     Interworking: Select highest priority cred if multiple matches
>>>
>>> Regards,
>>> Arend
>>>
>>> _______________________________________________
>>> HostAP mailing list
>>> HostAP at lists.shmoo.com
>>> http://lists.shmoo.com/mailman/listinfo/hostap
>> ---------------------------------------------------------------------
>> A member of the Intel Corporation group of companies
>>
>> This e-mail and any attachments may contain confidential material for the
>> sole use of the intended recipient(s). Any review or distribution by others is
>> strictly prohibited. If you are not the intended recipient, please contact the
>> sender and delete all copies.
>>
>> _______________________________________________
>> HostAP mailing list
>> HostAP at lists.shmoo.com
>> http://lists.shmoo.com/mailman/listinfo/hostap
> ---------------------------------------------------------------------
> A member of the Intel Corporation group of companies
> 
> This e-mail and any attachments may contain confidential material for
> the sole use of the intended recipient(s). Any review or distribution
> by others is strictly prohibited. If you are not the intended
> recipient, please contact the sender and delete all copies.
> 
>