linux-next: manual merge of the rtc tree with Linus' tree

From: Stephen Rothwell
Date: Sun Jul 09 2017 - 23:57:14 EST

Hi Alexandre,

Today's linux-next merge of the rtc tree got a conflict in:


between commit:

767392565a3e ("kselftests: timers: Add test for frequency step")

from Linus' tree and commit:

c96396f0780e ("tools: timer: add rtctest_setdate")

from the rtc 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.

Stephen Rothwell

diff --cc tools/testing/selftests/timers/Makefile
index 5801bbefbe89,54481f17518a..000000000000
--- a/tools/testing/selftests/timers/Makefile
+++ b/tools/testing/selftests/timers/Makefile
@@@ -8,8 -8,8 +8,8 @@@ TEST_GEN_PROGS = posix_timers nanoslee
inconsistency-check raw_skew threadtest rtctest

TEST_GEN_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew \
- skew_consistency clocksource-switch leap-a-day \
+ skew_consistency clocksource-switch freq-step leap-a-day \
- leapcrash set-tai set-2038 set-tz
+ leapcrash set-tai set-2038 set-tz rtctest_setdate

include ../