From patchwork Fri Nov 27 13:54:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7713391 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D70839F1BE for ; Fri, 27 Nov 2015 13:55:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06F0120613 for ; Fri, 27 Nov 2015 13:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C369203F7 for ; Fri, 27 Nov 2015 13:55:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751538AbbK0Nz1 (ORCPT ); Fri, 27 Nov 2015 08:55:27 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:52645 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbbK0Nz0 (ORCPT ); Fri, 27 Nov 2015 08:55:26 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0LoaZ0-1aVctY2nOM-00gVja; Fri, 27 Nov 2015 14:54:54 +0100 From: Arnd Bergmann To: Michal Marek , linux-kbuild@vger.kernel.org Cc: =?ISO-8859-1?Q?J=F6rn?= Engel , Prasad Joshi , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] logfs: clarify MTD dependency Date: Fri, 27 Nov 2015 14:54:53 +0100 Message-ID: <9365895.IkncCfXjo6@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:1BeLoRBDsb5vYa7DS4ahLiR9ZeywaKCDbhM1loQHvK2OKQD/sar Qsi3ULG2TnI3kNsu1u9xDzYzGUpfLVndUkwcBl4+wL5o8PloQU3uSHRsJqqlaheTSt7S3b8 MvmVbazdeJDjg9umZzr4QBZg8B0Nm/Fe2MCXPEhRJjaSIi8G12SzyMOWWRbwf9bQ+gzS3va MsUb43iPuzxzoIJtgbu6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:KFziQSkt/bs=:PRmrCud1Q1qh5I9kGWT1+6 BhWV4VR+DkbdiAU+jHP8OGPsCff2sY/nAJq3FvjXrgc2eGUC4xB+6zDqsSB1iB7ow8ZEagiQ6 bvVIICWcEI2uEYi0CQQAao4pxY39EpEAIDS3Y/gNfQYdJyh95i02cZocE2bJsbralC4QZkXY1 wgrZnxugA7DMy0KETKont3PELn7fDHiaa8p0XszNzv37XbbIaxkiBBjWP86H7bw1wB9X9q/MD cLGWdTeYNzCtxUGEDqQ7h5Tt7EAQjNXvyfqLjlmn/dKYKebdt5hzK0OZFQrH5rBeM/+Q0ZcCm M2fDu2dpsDB7AigkWLV7jTuTfTWjJ27f85/VJ78NAbabo4/CIHqXz3JM7TjdNOr9ICnBbgxf/ FRZ5YkPU2w6+uSje88VrfHW6wolsUHigeq9MnRJ3M3e4T+VBs1RoCp8og2RfB3nc9rmB3qcmJ 3WkkNUcNzSmLCW4iNfsba1AX2hRQ2FWAleYanpwde8Q2n8h/WLB731BcM4hIxeJdnq+ytr40U RvBVJ4mTxcxC2O4JqJtWBZsjvck5qninHMHpEH4G6U5bglUKxgp+G9PWLl3fySdAwbuX4uMBH f5ZuayLwyLOywjxGrJE5b+2Ar6TmICEvvvVhPx67ak58DVCFg+Qf8iDzD5ZFrIT0pyiTblei3 KCyFI6iQi1QQdAhztpOU288/IcLgsbZdjvfbc6q5Vt/L26LOby9jLOjix/7ZZa/+/2m47Ko41 Jqosezpx/+DVSt44 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After a change to the way that composite modules work, we get a logfs build error: fs/built-in.o: In function `logfs_mount': :(.text+0x139d34): undefined reference to `logfs_get_sb_mtd' fs/built-in.o: In function `logfs_get_sb_bdev': :(.text+0x13aa08): undefined reference to `logfs_get_sb_mtd' This patch avoids the error by changing the dependencies of logfs in a way that we can no longer configure logfs as built-in when the MTD core is a loadable module, while leaving the dependency to require at least one of MTD or BLOCK to be enabled. Signed-off-by: Arnd Bergmann Fixes: cf4f21938e13 ("kbuild: Allow to specify composite modules with modname-m") --- Found on today's linux-next. The commit that broke it is currently in the kbuild for-next tree, so please apply my fix on top, or fold it into the original patch. -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/logfs/Kconfig b/fs/logfs/Kconfig index 09ed066c0221..2b4503163930 100644 --- a/fs/logfs/Kconfig +++ b/fs/logfs/Kconfig @@ -1,6 +1,6 @@ config LOGFS tristate "LogFS file system" - depends on (MTD || BLOCK) + depends on MTD || (!MTD && BLOCK) select ZLIB_INFLATE select ZLIB_DEFLATE select CRC32