[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87egfephdm.fsf@kamboji.qca.qualcomm.com>
Date: Wed, 25 Nov 2015 11:17:57 +0200
From: Kalle Valo <kvalo@...eaurora.org>
To: Arend van Spriel <arend@...adcom.com>
Cc: Hauke Mehrtens <hauke@...ke-m.de>,
<linux-wireless@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <brcm80211-dev-list@...adcom.com>
Subject: Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Arend van Spriel <arend@...adcom.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 linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists