Messages in this thread | | | From | Kalle Valo <> | Subject | Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory | Date | Sun, 22 Nov 2015 19:23:37 +0200 |
| |
Arend van Spriel <arend@broadcom.com> writes:
> On 11/19/2015 08:48 AM, Kalle Valo wrote: >> Hauke Mehrtens <hauke@hauke-m.de> writes: >> >>> On 11/18/2015 03:45 PM, Kalle Valo wrote: >>>> Part of reorganising wireless drivers directory and Kconfig. Note that I had to >>>> edit Makefiles from subdirectories to use the new location. >>>> >>>> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> >>>> --- >>> >>> I would prefer to remove the brcm80211 directory in this process and create: >>> drivers/net/wireless/broadcom/brcmfmac >>> drivers/net/wireless/broadcom/brcmsmac >>> drivers/net/wireless/broadcom/brcmutil >>> drivers/net/wireless/broadcom/include >>> >>> This way we have one directory less. >> >> I think this could be done separately. This patchset is big enough >> already, I would not like to make it anymore complicated. >> >> And I actually like the brcm80211 directory, I would not mind keeping it >> still. > > 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.
-- Kalle Valo
| |