Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754473AbbKWK2y (ORCPT ); Mon, 23 Nov 2015 05:28:54 -0500 Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:6049 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751510AbbKWK2w (ORCPT ); Mon, 23 Nov 2015 05:28:52 -0500 X-IronPort-AV: E=Sophos;i="5.20,336,1444719600"; d="scan'208";a="81316406" Message-ID: <5652EA61.1080103@broadcom.com> Date: Mon, 23 Nov 2015 11:28:49 +0100 From: Arend van Spriel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Kalle Valo CC: Hauke Mehrtens , , , , Subject: Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory References: <1447857966-19560-1-git-send-email-kvalo@codeaurora.org> <1447857966-19560-7-git-send-email-kvalo@codeaurora.org> <564CCF2A.4030203@hauke-m.de> <871tbmwhsk.fsf@kamboji.qca.qualcomm.com> <564F966A.7080300@broadcom.com> <87lh9qrlra.fsf@kamboji.qca.qualcomm.com> In-Reply-To: <87lh9qrlra.fsf@kamboji.qca.qualcomm.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1770 Lines: 48 On 11/22/2015 06:23 PM, Kalle Valo wrote: > Arend van Spriel writes: > >> On 11/19/2015 08:48 AM, Kalle Valo wrote: >>> Hauke Mehrtens 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 >>>>> --- >>>> >>>> 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 Thanks, 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/