From patchwork Thu Feb 9 01:59:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 725911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vJhBb6Bvmz9s7f for ; Thu, 9 Feb 2017 13:01:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EwQl/Uqf"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cbe2l-00077j-61; Thu, 09 Feb 2017 02:01:07 +0000 Received: from mail-pg0-f66.google.com ([74.125.83.66]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cbe2c-00072V-OO for linux-mtd@lists.infradead.org; Thu, 09 Feb 2017 02:01:04 +0000 Received: by mail-pg0-f66.google.com with SMTP id 75so16379818pgf.3 for ; Wed, 08 Feb 2017 18:00:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=IyDoL+JEpmj1ID3OLHl2ZAL0/AyxkrVzgbIumWJ6OYk=; b=EwQl/UqfCf1gwodPWGixCgsDMQEVN6YTBbQ/Kn93vPoDvhSSATC132AqrjfTW7I1JI XkrHb1QIw//i/ug6MtFoFR9QyF1QPdxd1zdrD9CnKM/M+3Gol6TPjRk3LKQ/HKm7ltua RmBdHyBTnWnUwWncvZ+1T6TukaQvSMHQWal6TehdHXA6QK1LGgfX07dZURphjybP+UMx z2dtw8yD2LozgfPVGVzXokR8KHptZ0J49gCsi29XeMhpQGiytMMxX6H+IR9OWegRfVI/ SM26ON3/Q5bJ/EL+ZXsOHlJNSEaCcOG9+nNanm2/Wi37nrLWqp9dolSxsRoQCIRNX7Jc Vnmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=IyDoL+JEpmj1ID3OLHl2ZAL0/AyxkrVzgbIumWJ6OYk=; b=kIAUqC52enS8pcPQKFePG2rC49ts1U8W8bcBLpq1Hlnq88rVD5dFqKlHUA2IDtqnqu F5240bOek9WEmDmY+38V+5JktsUg/W4Wmc6ma3DPZZLwXaZI67dma+3z7yINVPBQCUgP SDh2EwclUU+Q61tzFL75o3jmK6gY6nULEDUNCwqxO5UibKigjKW2zlCmH7EVD10Bpnqj bmrE1gylGnKr+ithaSx/jlWBFor5AsgONKlhz19HhHEOCgoKmy6CXLe0cDak157JhT1j Ydh9bbIZBi/p272fjzIjaYcjuS4A8yLMJBl86Nw7+BWvRHum0xp6fzLOvJgIa3GKMCs2 I5Eg== X-Gm-Message-State: AMke39msRUiUOE35Rt0ELDldUS6iUykAjlmhA0iojGj+GcpuUwEwtHpLh60DFwk7Vr9hHQ== X-Received: by 10.84.136.135 with SMTP id 7mr815222pll.149.1486605577359; Wed, 08 Feb 2017 17:59:37 -0800 (PST) Received: from google.com ([2620:0:1000:1301:b8b4:e452:7f27:b7be]) by smtp.gmail.com with ESMTPSA id c64sm23441553pfa.45.2017.02.08.17.59.36 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 08 Feb 2017 17:59:36 -0800 (PST) Date: Wed, 8 Feb 2017 17:59:34 -0800 From: Brian Norris To: Stephen Rothwell Subject: Re: linux-next: build failure after merge of the l2-mtd tree Message-ID: <20170209015934.GA135772@google.com> References: <20170209120839.50a8cfdb@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170209120839.50a8cfdb@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170208_180058_881020_92DE8681 X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [74.125.83.66 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [74.125.83.66 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.83.66 listed in wl.mailspike.net] 2.5 SUSPICIOUS_RECIPS Similar addresses in recipient list -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (computersforpeace[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-next@vger.kernel.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Hi, On Thu, Feb 09, 2017 at 12:08:39PM +1100, Stephen Rothwell wrote: > Hi Brian, > > After merging the l2-mtd tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined! > ERROR: "of_flash_probe_gemini" [drivers/mtd/maps/physmap_of.ko] undefined! > > Probably caused by commit > > 56ff337ea433 ("mtd: physmap_of: add a hook for Gemini flash probing") > > The config has: > > CONFIG_MTD_PHYSMAP=m > CONFIG_MTD_PHYSMAP_COMPAT=y > CONFIG_MTD_PHYSMAP_OF=m > CONFIG_MTD_PHYSMAP_OF_VERSATILE=y > CONFIG_MTD_PHYSMAP_OF_GEMINI=y > > I am not sure why this is a problem, but previously physmap_of_versatile.o > would have been in obj-m and it is now in obj-y. I think this part of that change does it: I'll cook that into a proper patch if it seems good. > I have used the version fo the l2-mtd tree from next-20170208 for today. Sounds good. Brian --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -18,9 +18,8 @@ obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o obj-$(CONFIG_MTD_PHYSMAP) += physmap.o obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o -ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE -obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of_versatile.o -endif +obj-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o +obj-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o obj-$(CONFIG_MTD_PISMO) += pismo.o obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o We were previously just keeping physmap_of_versatile in sync with physmap_of. So it could be a module, even though CONFIG_MTD_PHYSMAP_OF_VERSATILE was 'bool'. This is kind of a weird scenario, since physmap_of actually depends on *_versatile or *_gemini (when enabled). Maybe we should revert to something like the original logic. We can even actually merge the 3 modules (and then drop the EXPORT_*s too): diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 2fec1e0c2371..aef1846b4de2 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -17,9 +17,13 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o obj-$(CONFIG_MTD_PHYSMAP) += physmap.o +ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE +physmap_of-objs += physmap_of_versatile.o +endif +ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI +physmap_of-objs += physmap_of_gemini.o +endif obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o -obj-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o -obj-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o obj-$(CONFIG_MTD_PISMO) += pismo.o obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o