From: Kalle Valo <kvalo@codeaurora.org>
To: Arend van Spriel <arend@broadcom.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>,
<linux-wireless@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <brcm80211-dev-list@broadcom.com>
Subject: Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Date: Wed, 25 Nov 2015 11:17:57 +0200 [thread overview]
Message-ID: <87egfephdm.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <5652EC10.9010708@broadcom.com> (Arend van Spriel's message of "Mon, 23 Nov 2015 11:36:00 +0100")
Arend van Spriel <arend@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
next prev parent reply other threads:[~2015-11-25 9:18 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-18 14:45 [PATCH v2 00/27] wireless drivers vendor directories Kalle Valo
2015-11-18 14:45 ` [PATCH v2 01/27] adm80211: move under admtek vendor directory Kalle Valo
2015-11-18 14:45 ` [PATCH v2 02/27] airo: move under cisco " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 03/27] atmel: move under atmel " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 04/27] b43: move under broadcom " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 05/27] b43legacy: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 06/27] brcm80211: " Kalle Valo
2015-11-18 19:19 ` Hauke Mehrtens
2015-11-18 19:21 ` Florian Fainelli
[not found] ` <564CCFC3.3030909-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-11-19 7:54 ` Kalle Valo
2015-11-20 21:51 ` Arend van Spriel
2015-11-19 7:48 ` Kalle Valo
2015-11-20 21:53 ` Arend van Spriel
2015-11-21 13:46 ` Hauke Mehrtens
2015-11-22 17:23 ` Kalle Valo
2015-11-23 10:28 ` Arend van Spriel
2015-11-23 10:36 ` Arend van Spriel
2015-11-25 9:17 ` Kalle Valo [this message]
2015-11-18 14:45 ` [PATCH v2 07/27] cw1200: move under st " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 08/27] ipw2x00: move under intel " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 09/27] iwlegacy: move under intel directory Kalle Valo
2015-11-18 14:45 ` [PATCH v2 10/27] iwlwifi: move under intel vendor directory Kalle Valo
2015-11-18 21:21 ` Emmanuel Grumbach
2015-11-18 21:30 ` David Miller
2015-11-18 14:45 ` [PATCH v2 11/27] libertas: move under marvell " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 12/27] libertas_tf: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 13/27] mwifiex: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 14/27] mwl8k: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 15/27] zd1201: move under zydas " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 16/27] zd1211rw: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 17/27] hostap: move under intersil " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 18/27] p54: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 19/27] orinoco: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 20/27] prism54: " Kalle Valo
2015-11-18 14:46 ` [PATCH v2 21/27] realtek: create separate Kconfig file Kalle Valo
[not found] ` <1447857966-19560-22-git-send-email-kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-11-18 16:30 ` Larry Finger
2015-11-18 14:46 ` [PATCH v2 22/27] rsi: add vendor Kconfig entry Kalle Valo
2015-11-18 14:46 ` [PATCH v2 23/27] rt2x00: move under ralink vendor directory Kalle Valo
[not found] ` <1447857966-19560-24-git-send-email-kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-11-19 22:05 ` Jakub Kicinski
2015-11-20 9:29 ` Kalle Valo
2015-11-18 14:46 ` [PATCH v2 24/27] mediatek: unify Kconfig with other vendors Kalle Valo
2015-11-18 14:46 ` [PATCH v2 25/27] ti: " Kalle Valo
2015-11-18 14:46 ` [PATCH v2 26/27] ath: " Kalle Valo
[not found] ` <1447857966-19560-1-git-send-email-kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-11-18 14:46 ` [PATCH v2 27/27] mac80211_hwsim: move Kconfig entry for sorting alphabetically Kalle Valo
2015-11-22 17:30 ` [PATCH v2 00/27] wireless drivers vendor directories Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87egfephdm.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=arend@broadcom.com \
--cc=brcm80211-dev-list@broadcom.com \
--cc=hauke@hauke-m.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).