From: Nicolas Pitre <nicolas.pitre@linaro.org>
To: David Miller <davem@davemloft.net>
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'
Date: Mon, 5 Dec 2016 10:44:32 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.20.1612051039010.1657@knanqh.ubzr> (raw)
In-Reply-To: <20161203.233945.1757084444220812603.davem@davemloft.net>
On Sat, 3 Dec 2016, David Miller wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 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 <arnd@arndb.de>
>
> 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.
Nicolas
next prev parent reply other threads:[~2016-12-05 15:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 23:04 [PATCH net-next] liquidio: 'imply' ptp instead of 'select' Arnd Bergmann
2016-12-02 23:20 ` Nicolas Pitre
2016-12-02 23:20 ` David Daney
2016-12-03 1:23 ` kbuild test robot
2016-12-04 4:39 ` David Miller
2016-12-05 15:44 ` Nicolas Pitre [this message]
2016-12-05 17:20 ` David Miller
2016-12-05 18:44 ` Nicolas Pitre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.20.1612051039010.1657@knanqh.ubzr \
--to=nicolas.pitre@linaro.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=david.daney@cavium.com \
--cc=felix.manlunas@caviumnetworks.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rvatsavayi@caviumnetworks.com \
--cc=satananda.burla@caviumnetworks.com \
--cc=sgoutham@cavium.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).