From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolas Pitre <nicolas.pitre@linaro.org>,
WingMan Kwok <w-kwok2@ti.com>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Mon, 12 Dec 2016 13:30:00 +1100 [thread overview]
Message-ID: <20161212133000.6cf7a90e@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/net/ethernet/ti/Kconfig
between commit:
6246168b4a38 ("net: ethernet: ti: netcp: add support of cpts")
from the net-next tree and commit:
d1cbfd771ce8 ("ptp_clock: Allow for it to be optional")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/ti/Kconfig
index dc217fd7a734,61b835a7e6ae..000000000000
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@@ -74,14 -74,13 +74,14 @@@ config TI_CPS
will be called cpsw.
config TI_CPTS
- bool "TI Common Platform Time Sync (CPTS) Support"
- depends on TI_CPSW
+ tristate "TI Common Platform Time Sync (CPTS) Support"
+ depends on TI_CPSW || TI_KEYSTONE_NETCP
- select PTP_1588_CLOCK
+ imply PTP_1588_CLOCK
---help---
This driver supports the Common Platform Time Sync unit of
- the CPSW Ethernet Switch. The unit can time stamp PTP UDP/IPv4
- and Layer 2 packets, and the driver offers a PTP Hardware Clock.
+ the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.
+ The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the
+ driver offers a PTP Hardware Clock.
config TI_KEYSTONE_NETCP
tristate "TI Keystone NETCP Core Support"
next reply other threads:[~2016-12-12 2:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 2:30 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 2:13 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2022-01-10 1:12 Stephen Rothwell
2019-10-18 2:31 Stephen Rothwell
2019-10-18 5:00 ` Alexei Starovoitov
2019-02-15 2:20 Stephen Rothwell
2017-11-01 7:15 Stephen Rothwell
2017-11-01 8:18 ` Peter Zijlstra
2017-11-01 8:27 ` Ingo Molnar
2017-11-01 8:55 ` Peter Zijlstra
2017-11-01 9:04 ` Ingo Molnar
2017-11-01 10:57 ` Stephen Rothwell
2017-11-01 7:10 Stephen Rothwell
2017-10-30 20:55 Mark Brown
2017-11-13 6:00 ` Stephen Rothwell
2017-08-31 3:47 Stephen Rothwell
2017-09-05 0:05 ` Stephen Rothwell
2017-02-20 1:22 Stephen Rothwell
2017-02-20 9:02 ` Daniel Borkmann
2016-12-01 3:46 Stephen Rothwell
2016-11-17 3:04 Stephen Rothwell
2015-04-07 7:11 Stephen Rothwell
2015-04-07 7:32 ` Daniel Borkmann
2015-04-07 16:10 ` Alexei Starovoitov
2015-04-07 7:04 Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov
2015-04-07 7:00 Stephen Rothwell
2015-04-07 7:30 ` Daniel Borkmann
2014-07-25 4:38 Stephen Rothwell
2014-05-05 4:29 Stephen Rothwell
2014-01-13 3:18 Stephen Rothwell
2014-01-13 3:20 ` Stephen Rothwell
2014-01-14 3:02 ` Stephen Rothwell
2014-01-14 4:51 ` H. Peter Anvin
2014-01-14 5:19 ` Stephen Rothwell
2014-01-14 5:19 ` David Miller
2014-01-14 5:44 ` Stephen Rothwell
2014-01-14 5:48 ` David Miller
2014-01-14 6:10 ` Stephen Rothwell
2013-11-08 4:58 Stephen Rothwell
2013-04-11 4:03 Stephen Rothwell
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=20161212133000.6cf7a90e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=netdev@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=w-kwok2@ti.com \
/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).