From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756136AbcLBXFS (ORCPT ); Fri, 2 Dec 2016 18:05:18 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:57686 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750AbcLBXFQ (ORCPT ); Fri, 2 Dec 2016 18:05:16 -0500 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Felix Manlunas , Thomas Gleixner , David Daney , Satanand Burla , Raghu Vatsavayi , Nicolas Pitre , Sunil Goutham , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] liquidio: 'imply' ptp instead of 'select' Date: Sat, 3 Dec 2016 00:04:32 +0100 Message-Id: <20161202230451.1639318-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:3jF/V3qSlMDJg+kjAy0Xo0C8sYgRssp3Brm6KpWzbr0uCl/+vMR QnD+wpDxH9Fnulxfv3V8Gy9VXQs1tcJ0lMKexpO9JPEuArcc/TFob5L3DOYohj0zvHunL2h SizG/JrgZQhyoMfrpkPFfyYRvlo9vf+6LsgigPFen0lBrJ2t9h2wirjCEBciboXuLbDtT8x WNHtX5pNZdEVkIiTMN2FQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:LpP5Q+HykQM=:G5dsXZHzYncuDMLuBIi2c/ s/iFswrBmSKMQeNyKJGimE47BopttEaQ2VZAH1sMe6j4S4cyhvz5dz6rARLoPfQ/MqjGuJXLe HrJ3JO5S97MzQG1px8hZ+1h+BI1PTXjIKmfrHmYuwvXZa08H41BIiFMT0F0egHMx/FtZa6j9p ukwr0Rr3dudVdF4WzuxyB4h4TVUShZlfNwpEXzKM4fRabo6RhPHA0ikZrPwXCLB7tycyPVht7 ev5FDfp8+rSyuwWpLi47UuYxF6/b65SukoUictV0XH0DSn2AQuEEbH5A0VuGGnMA4z2/4n1o9 sBr3JPWkODhBdztO351t4mQhCsYCMcONUYi9kZ5f2X81qH01FzigoKDoQ77Czi0DxnOMpmR3D lA110uWU67I+Ro1YCWU7K2LhT2CCzt28bfWIOBn5c2TNbGyg16cwUDGbiD3h9dD1UxWKVmnDM 45eSdyVao0yu2io50l9EqTdvkPSjE1LcoWDdToylgZIkHj6QGeMGwrDmte5bksbkbiOWzTwBm M6GUnzd1yRih5hbP0Q5ZrBrsy5iHkeHclMCR8iQykPQ72UBwKxD2o4GL0qrj59KlkTZZ3nMBr 0Z3b2VAgoB4cKiQqra5BoPofpJnpAnJkDfFA+JUfJ5+eIrg8koYEhKAdt3nBT/9toWl2Wwf/H v2sgG4DqhrYBQflcE+qCWk+ZIsYOwyp4613t6KnaFQNd3OTbFBvkOb3QmvBNeOXVO0wo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/ethernet/cavium/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index bbc8bd16cb97..dcbce6cac63e 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -77,7 +77,7 @@ config OCTEON_MGMT_ETHERNET config LIQUIDIO_VF tristate "Cavium LiquidIO VF support" depends on 64BIT && PCI_MSI - select PTP_1588_CLOCK + imply PTP_1588_CLOCK ---help--- This driver supports Cavium LiquidIO Intelligent Server Adapter based on CN23XX chips. -- 2.9.0