From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Josh Triplett <josh@joshtriplett•org>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
John Stultz <john.stultz@linaro•org>,
Catalina Mocanu <catalina.mocanu@gmail•com>
Subject: linux-next: manual merge of the tiny tree with the tip tree
Date: Tue, 25 Nov 2014 17:03:15 +1100 [thread overview]
Message-ID: <20141125170315.13157c60@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 968 bytes --]
Hi Josh,
Today's linux-next merge of the tiny tree got a conflict in
kernel/time/Makefile between commit fd866e2b116b ("time: Rename
udelay_test.c to test_udelay.c") from the tip tree and commit
d1f6d68d03ea ("kernel: time: Compile out NTP support") from the tiny
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc kernel/time/Makefile
index f622cf28628a,d07d4c9207b9..000000000000
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@@ -13,7 -13,8 +13,8 @@@ obj-$(CONFIG_TICK_ONESHOT) += tick-on
obj-$(CONFIG_TICK_ONESHOT) += tick-sched.o
obj-$(CONFIG_TIMER_STATS) += timer_stats.o
obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o
-obj-$(CONFIG_TEST_UDELAY) += udelay_test.o
+obj-$(CONFIG_TEST_UDELAY) += test_udelay.o
+ obj-$(CONFIG_NTP) += ntp.o
$(obj)/time.o: $(obj)/timeconst.h
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-25 6:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 6:03 Stephen Rothwell [this message]
2014-11-25 6:16 ` linux-next: manual merge of the tiny tree with the tip tree Ingo Molnar
2014-11-25 6:30 ` John Stultz
2014-11-25 7:20 ` Josh Triplett
2014-11-25 6:48 ` Josh Triplett
2014-11-25 10:10 ` Ingo Molnar
2014-11-26 0:04 ` josh
2014-12-08 11:09 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2014-09-26 6:45 Stephen Rothwell
2014-09-23 4:32 Stephen Rothwell
2014-09-23 5:43 ` Ingo Molnar
2014-09-23 6:21 ` Josh Triplett
2014-09-23 8:36 ` Ingo Molnar
2014-10-29 15:52 ` Josh Triplett
2014-09-23 4:23 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=20141125170315.13157c60@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalina.mocanu@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=john.stultz@linaro$(echo .)org \
--cc=josh@joshtriplett$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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