Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1275229

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Show all headers | View raw

On 11/23/2015 11:28 AM, Arend van Spriel wrote:
> On 11/22/2015 06:23 PM, Kalle Valo wrote:
>> 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.
>
> 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 ;-)

Regards,
Arend

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Hauke Mehrtens <hauke@hauke-m.de> - 2015-11-18 20:20 +0100
  Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Florian Fainelli <f.fainelli@gmail.com> - 2015-11-18 20:30 +0100
    Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Kalle Valo <kvalo@codeaurora.org> - 2015-11-19 09:00 +0100
      Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Arend van Spriel <arend@broadcom.com> - 2015-11-20 23:00 +0100
  Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Kalle Valo <kvalo@codeaurora.org> - 2015-11-19 08:50 +0100
    Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Arend van Spriel <arend@broadcom.com> - 2015-11-20 23:00 +0100
      Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Hauke Mehrtens <hauke@hauke-m.de> - 2015-11-21 14:50 +0100
      Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Kalle Valo <kvalo@codeaurora.org> - 2015-11-22 18:30 +0100
        Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Arend van Spriel <arend@broadcom.com> - 2015-11-23 11:30 +0100
          Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Arend van Spriel <arend@broadcom.com> - 2015-11-23 11:40 +0100
            Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory Kalle Valo <kvalo@codeaurora.org> - 2015-11-25 10:20 +0100

csiph-web