2018-01-09 12:25:34

by Arend Van Spriel

[permalink] [raw]
Subject: Re: [09/11] brcmfmac: Remove array of functions

On 1/8/2018 6:20 PM, Kalle Valo wrote:
> Arend Van Spriel <[email protected]> wrote:
>
>> Replace the array of functions with a pair of pointers to the
>> relevant functions.
>>
>> Signed-off-by: Ian Molton <[email protected]>
>> Acked-by: Arend van Spriel <[email protected]>
>> Signed-off-by: Arend van Spriel <[email protected]>
>
> Failed to apply:
>
> fatal: sha1 information is lacking or useless (drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c).
> error: could not build fake ancestor
> Applying: brcmfmac: Remove array of functions
> Patch failed at 0001 brcmfmac: Remove array of functions
> The copy of the patch that failed is found in: .git/rebase-apply/patch

Guess you merged wireless-drivers/master in between. I just rebased and
resolved the conflict and sent a V2 with the remaining patches.

> 3 patches set to Changes Requested.
>
> 10123215 [09/11] brcmfmac: Remove array of functions
> 10123207 [10/11] brcmfmac: add comment block in brcmf_sdio_buscore_read()
> 10123205 [11/11] brcmfmac: rename brcmf_sdiod_buff_{read,write}() functions
>

Thanks,
Arend


2018-01-09 12:27:52

by Kalle Valo

[permalink] [raw]
Subject: Re: [09/11] brcmfmac: Remove array of functions

Arend van Spriel <[email protected]> writes:

> On 1/8/2018 6:20 PM, Kalle Valo wrote:
>> Arend Van Spriel <[email protected]> wrote:
>>
>>> Replace the array of functions with a pair of pointers to the
>>> relevant functions.
>>>
>>> Signed-off-by: Ian Molton <[email protected]>
>>> Acked-by: Arend van Spriel <[email protected]>
>>> Signed-off-by: Arend van Spriel <[email protected]>
>>
>> Failed to apply:
>>
>> fatal: sha1 information is lacking or useless
>> (drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c).
>> error: could not build fake ancestor
>> Applying: brcmfmac: Remove array of functions
>> Patch failed at 0001 brcmfmac: Remove array of functions
>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>
> Guess you merged wireless-drivers/master in between.

Actually fast forwarded to latest net-next, so I got the latest
wireless-drivers via that route.

> I just rebased and resolved the conflict and sent a V2 with the
> remaining patches.

Saw them, thanks.

--
Kalle Valo