linux-next: manual merge of the rcu tree with the tip tree

[Stephen Rothwell]

Hi all,

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

  kernel/time/tick-internal.h

between commits:

  8c3b5e6ec0fe ("hrtimer: Ensure timerfd notification for HIGHRES=n")
  a761a67f591a ("timekeeping: Distangle resume and clock-was-set events")
  17a1b8826b45 ("hrtimer: Add bases argument to clock_was_set()")

from the tip tree and commit:

  a5e8561a2bdf ("clocksource: Make clocksource-wdtest.c safe for slow-HZ systems")

from the rcu 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 kernel/time/tick-internal.h
index 3548f0829e6d,5459bab2f4f7..000000000000
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@@ -166,14 -166,22 +166,34 @@@ DECLARE_PER_CPU(struct hrtimer_cpu_base
  extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem);
  void timer_clear_idle(void);
  
 +#define CLOCK_SET_WALL							\
 +	(BIT(HRTIMER_BASE_REALTIME) | BIT(HRTIMER_BASE_REALTIME_SOFT) |	\
 +	 BIT(HRTIMER_BASE_TAI) | BIT(HRTIMER_BASE_TAI_SOFT))
 +
 +#define CLOCK_SET_BOOT							\
 +	(BIT(HRTIMER_BASE_BOOTTIME) | BIT(HRTIMER_BASE_BOOTTIME_SOFT))
 +
 +void clock_was_set(unsigned int bases);
 +void clock_was_set_delayed(void);
 +
 +void hrtimers_resume_local(void);
++
+ /* Since jiffies uses a simple TICK_NSEC multiplier
+  * conversion, the .shift value could be zero. However
+  * this would make NTP adjustments impossible as they are
+  * in units of 1/2^.shift. Thus we use JIFFIES_SHIFT to
+  * shift both the nominator and denominator the same
+  * amount, and give ntp adjustments in units of 1/2^8
+  *
+  * The value 8 is somewhat carefully chosen, as anything
+  * larger can result in overflows. TICK_NSEC grows as HZ
+  * shrinks, so values greater than 8 overflow 32bits when
+  * HZ=100.
+  */
+ #if HZ < 34
+ #define JIFFIES_SHIFT	6
+ #elif HZ < 67
+ #define JIFFIES_SHIFT	7
+ #else
+ #define JIFFIES_SHIFT	8
+ #endif

Attachment: pgp20lIUASoB_.pgp
Description: OpenPGP digital signature