From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:16122 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbbEUKa1 (ORCPT ); Thu, 21 May 2015 06:30:27 -0400 Message-ID: <555DB3C0.7010000@broadcom.com> (sfid-20150521_123031_659842_AEFEB49E) Date: Thu, 21 May 2015 12:30:24 +0200 From: Arend van Spriel MIME-Version: 1.0 To: Kalle Valo CC: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , linux-wireless , Hante Meuleman , "linux-mips@linux-mips.org" , Hauke Mehrtens Subject: Re: [PATCH 6/6] brcmfmac: Add support for host platform NVRAM loading. References: <1432123792-4155-1-git-send-email-arend@broadcom.com> <1432123792-4155-7-git-send-email-arend@broadcom.com> <555DA529.6000901@broadcom.com> <87vbfm6xsg.fsf@kamboji.qca.qualcomm.com> In-Reply-To: <87vbfm6xsg.fsf@kamboji.qca.qualcomm.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 05/21/15 12:16, Kalle Valo wrote: > Arend van Spriel writes: > >> On 05/21/15 10:28, Rafał Miłecki wrote: >>> On 20 May 2015 at 16:33, Rafał Miłecki wrote: >>>> I think the best way for achieving this is to rework your patch to >>>> modify include/linux/bcm47xx_nvram.h. You could modify it the same way >>>> you did in your patch for MIPS tree, except for >>>> bcm47xx_nvram_get_contents. Don't implement this function for real (in >>>> .c file), but instead make in dummy inline in a bcm47xx_nvram.h like: >>>> static inline char *bcm47xx_nvram_get_contents(size_t *val_len) >>>> { >>>> /* TODO: Implement in .c file */ >>>> return NULL; >>>> } >>> >>> One more note. >>> This of course will lead to conflict at some point, but I believe >>> Linus will handle it. >> >> I prefer to avoid tricks so I will ask to drop this patch and wait for >> it to land in the next kernel, ie. 4.2, and resubmit this patch for >> 4.3. I am not in a hurry. > > Yes, please :) Let's try to avoid conflicts as much as possible. Ok. Let's make it official. Kalle, can you drop patch 6 from the series (if not already done so ;-) ). Regards, Arend