From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752300AbcLERUd (ORCPT ); Mon, 5 Dec 2016 12:20:33 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:46484 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672AbcLERUb (ORCPT ); Mon, 5 Dec 2016 12:20:31 -0500 Date: Mon, 05 Dec 2016 12:20:29 -0500 (EST) Message-Id: <20161205.122029.1310361702811893159.davem@davemloft.net> To: nicolas.pitre@linaro.org Cc: arnd@arndb.de, felix.manlunas@caviumnetworks.com, tglx@linutronix.de, david.daney@cavium.com, satananda.burla@caviumnetworks.com, rvatsavayi@caviumnetworks.com, sgoutham@cavium.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next] liquidio: 'imply' ptp instead of 'select' From: David Miller In-Reply-To: References: <20161202230451.1639318-1-arnd@arndb.de> <20161203.233945.1757084444220812603.davem@davemloft.net> X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Mon, 05 Dec 2016 08:21:08 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicolas Pitre Date: Mon, 5 Dec 2016 10:44:32 -0500 (EST) > On Sat, 3 Dec 2016, David Miller wrote: > >> From: Arnd Bergmann >> Date: Sat, 3 Dec 2016 00:04:32 +0100 >> >> > ptp now depends on the optional POSIX_TIMERS setting and fails to build >> > if we select it without that: >> > >> > warning: (LIQUIDIO_VF && TI_CPTS) selects PTP_1588_CLOCK which has unmet direct dependencies (NET && POSIX_TIMERS) >> > warning: (LIQUIDIO_VF && TI_CPTS) selects PTP_1588_CLOCK which has unmet direct dependencies (NET && POSIX_TIMERS) >> > ERROR: "posix_clock_unregister" [drivers/ptp/ptp.ko] undefined! >> > ERROR: "posix_clock_register" [drivers/ptp/ptp.ko] undefined! >> > ERROR: "pps_unregister_source" [drivers/ptp/ptp.ko] undefined! >> > ERROR: "pps_event" [drivers/ptp/ptp.ko] undefined! >> > ERROR: "pps_register_source" [drivers/ptp/ptp.ko] undefined! >> > >> > It seems that two patches have collided here, the build failure >> > is a result of the combination. Changing the new option to 'imply' >> > as well fixes it. >> > >> > Fixes: 111fc64a237f ("liquidio CN23XX: VF registration") >> > Fixes: d1cbfd771ce8 ("ptp_clock: Allow for it to be optional") >> > Signed-off-by: Arnd Bergmann >> >> Like the kbuild robot, when I apply this it complains about 'imply' being >> an unknown option. >> >> I guess it worked for you because support for 'imply' exists in the -next >> tree and gets pulled in from somewhere else. > > Exact. > >> In any event, as-is I cannot apply this. > > It should be carried in linux-next for the time being, and suggested as > a probable "merge resolution" to Linus when submitting your tree for > merging. I think that's the best that can be done. This means the build of pure net-next is broken, which is unacceptble, as this is the tree that many developers do their work and build tests against. You cannot have the proper functioning of net-next depend upon something not in that tree. Therefore, you must resolve this without the 'imply' keyword somehow. Thanks.