Arend van Spriel <ar...@broadcom.com> writes:

>>>> I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module
>>>> so I want to keep them together under brcm80211.
>>>>
>>>> So does this patch go in before or after the patches I submitted
>>>> before the merge window. I hope after :-p
>>>
>>> Sorry, the vendor patches go in first :) It's much safer that way.
>>>
>>> But I think that git should be smart enough and your patchset from
>>> before the merge window should still apply without issues.
>>
>> Will see if that is true when I merge it in our internal repo. :-p
>
> Just applied the pending patches using 'git am -3' and that works
> fine. So when told to be smart, git is indeed smart ;-)

Git is awesome :) Thanks for checking.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to