From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA58FC433ED for ; Sat, 17 Apr 2021 00:45:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2F1CD611C2 for ; Sat, 17 Apr 2021 00:45:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F1CD611C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AE4F46B006C; Fri, 16 Apr 2021 20:45:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A950F6B006E; Fri, 16 Apr 2021 20:45:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 935666B0070; Fri, 16 Apr 2021 20:45:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0099.hostedemail.com [216.40.44.99]) by kanga.kvack.org (Postfix) with ESMTP id 776836B006C for ; Fri, 16 Apr 2021 20:45:44 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2586F180AD83B for ; Sat, 17 Apr 2021 00:45:44 +0000 (UTC) X-FDA: 78040016208.35.15CF8A6 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf05.hostedemail.com (Postfix) with ESMTP id F32BEE00010B for ; Sat, 17 Apr 2021 00:45:42 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 1F0876124B for ; Sat, 17 Apr 2021 00:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618620341; bh=lSsnVay0rJWW6MjOZqm8flZ5I5tTGTUG6tF6O4/guDA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=Tyv15qdH10P1CX6MbjYxxWSCqw5E01W2VOrmv7oxnMSFEyrN594lfuz1l1Gqm+Vs7 Fd8Gsblu5fVfeV+VN1cKQjdBPgmKMWMDmoAKoBKsKlHLs7Y0z7k4MoUvKmMb92cWCY 8aYrmnsrlVQ2SoPNccRHTqzaMqOalPEVxh5qTg7s9Fel1Wkwu82xZTgKwVqaoww9xF a4CsmFbugxLQ/D7PtA08djX+zRO3ras027Sws6GUYBRezPFsFuuHVFi30uDvoS0miq W56AOUDHwXTZbSxoPOuryGKbCRxdZww3pjQ36TYMbPZXbnKkTcb/U1iczhb1wD0AoC fLxBkx4jPNXLQ== Received: by mail-lf1-f50.google.com with SMTP id z13so30375082lfd.9 for ; Fri, 16 Apr 2021 17:45:41 -0700 (PDT) X-Gm-Message-State: AOAM533DhVYVUtxzH168F8CS8b7w8jeOejeiOJFtyGz5DNt8saerr4W5 nnAg/bIzspqRcwP/iXRSMqVTBmg3sPJ+aSTLTpU= X-Google-Smtp-Source: ABdhPJz32kliawinOEuXKfgFPcpC2BEqt0tlvGESX2Sa34wzDqUIxi1I5niUwnf7/+B9QQghlWUZT+Px75+KnnGukc4= X-Received: by 2002:a05:6512:3f02:: with SMTP id y2mr4737601lfa.355.1618620339526; Fri, 16 Apr 2021 17:45:39 -0700 (PDT) MIME-Version: 1.0 References: <20210416154523.3f9794326e8e1db549873cf8@linux-foundation.org> <20210416224603.EETOY2Or4%akpm@linux-foundation.org> In-Reply-To: <20210416224603.EETOY2Or4%akpm@linux-foundation.org> From: Guo Ren Date: Sat, 17 Apr 2021 08:45:28 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [patch 04/12] csky: change a Kconfig symbol name to fix e1000 build error To: Andrew Morton Cc: Jesse Brandeburg , Linux-MM , kbuild test robot , mm-commits@vger.kernel.org, Randy Dunlap , Linus Torvalds Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: F32BEE00010B X-Stat-Signature: 8jukgncmq8jpp6qcnqda19mdswhwe6bf X-Rspamd-Server: rspam02 Received-SPF: none (kernel.org>: No applicable sender policy available) receiver=imf05; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618620342-490254 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Looks good to me, I'll approve it in my linux-next tree. On Sat, Apr 17, 2021 at 6:46 AM Andrew Morton wrote: > > From: Randy Dunlap > Subject: csky: change a Kconfig symbol name to fix e1000 build error > > e1000's #define of CONFIG_RAM_BASE conflicts with a Kconfig symbol in > arch/csky/Kconfig. > > The symbol in e1000 has been around longer, so change arch/csky/ to use > DRAM_BASE instead of RAM_BASE to remove the conflict. (although e1000 is > also a 2-line change) > > Link: https://lkml.kernel.org/r/20210411055335.7111-1-rdunlap@infradead.org > Signed-off-by: Randy Dunlap > Reported-by: kernel test robot > Acked-by: Guo Ren > Cc: Jesse Brandeburg > Signed-off-by: Andrew Morton > --- > > arch/csky/Kconfig | 2 +- > arch/csky/include/asm/page.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > --- a/arch/csky/include/asm/page.h~csky-change-a-kconfig-symbol-name-to-fix-e1000-build-error > +++ a/arch/csky/include/asm/page.h > @@ -28,7 +28,7 @@ > #define SSEG_SIZE 0x20000000 > #define LOWMEM_LIMIT (SSEG_SIZE * 2) > > -#define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE & (SSEG_SIZE - 1)) > +#define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1)) > > #ifndef __ASSEMBLY__ > > --- a/arch/csky/Kconfig~csky-change-a-kconfig-symbol-name-to-fix-e1000-build-error > +++ a/arch/csky/Kconfig > @@ -314,7 +314,7 @@ config FORCE_MAX_ZONEORDER > int "Maximum zone order" > default "11" > > -config RAM_BASE > +config DRAM_BASE > hex "DRAM start addr (the same with memory-section in dts)" > default 0x0 > > _ -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/