linux-kernel - linux-next: manual merge of the tiny tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141125170315.13157c60@canb.auug.org.au>
Date:	Tue, 25 Nov 2014 17:03:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Josh Triplett <josh@...htriplett.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	John Stultz <john.stultz@...aro.org>,
	Catalina Mocanu <catalina.mocanu@...il.com>
Subject: linux-next: manual merge of the tiny tree with the tip tree

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@...b.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
  

Content of type "application/pgp-signature" skipped