From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 21 May 2015 12:30:35 +0200 (CEST) Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:1214 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27012377AbbEUKad07o8k (ORCPT ); Thu, 21 May 2015 12:30:33 +0200 X-IronPort-AV: E=Sophos;i="5.13,468,1427785200"; d="scan'208";a="65438756" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw2-out.broadcom.com with ESMTP; 21 May 2015 03:40:58 -0700 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.235.1; Thu, 21 May 2015 03:30:26 -0700 Received: from mail-sj1-12.sj.broadcom.com (10.10.10.20) by IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) with Microsoft SMTP Server id 14.3.235.1; Thu, 21 May 2015 03:30:26 -0700 Received: from [10.176.128.60] (xl-bun-02.bun.broadcom.com [10.176.128.60]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 4AEFD27A81; Thu, 21 May 2015 03:30:25 -0700 (PDT) Message-ID: <555DB3C0.7010000@broadcom.com> Date: Thu, 21 May 2015 12:30:24 +0200 From: Arend van Spriel User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.2.24) Gecko/20111103 Lightning/1.0b2 Thunderbird/3.1.16 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 Content-Transfer-Encoding: 8bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 47512 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: arend@broadcom.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips 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