From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ie0-f176.google.com ([209.85.223.176]:33370 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbbEUJc3 convert rfc822-to-8bit (ORCPT ); Thu, 21 May 2015 05:32:29 -0400 Received: by iebgx4 with SMTP id gx4so3987147ieb.0 for ; Thu, 21 May 2015 02:32:28 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <555DA529.6000901@broadcom.com> References: <1432123792-4155-1-git-send-email-arend@broadcom.com> <1432123792-4155-7-git-send-email-arend@broadcom.com> <555DA529.6000901@broadcom.com> Date: Thu, 21 May 2015 11:32:28 +0200 Message-ID: (sfid-20150521_113234_175916_E29716DE) Subject: Re: [PATCH 6/6] brcmfmac: Add support for host platform NVRAM loading. From: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= To: Arend van Spriel Cc: Kalle Valo , linux-wireless , Hante Meuleman , "linux-mips@linux-mips.org" , Hauke Mehrtens Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 21 May 2015 at 11:28, Arend van Spriel wrote: > 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. OK :) -- Rafał