Subject: linux-next: manual merge of the tip tree with the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 24 Aug 2009 17:01:19 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/s390/kernel/time.c between commit
6342887c12d79c5a2c8c1de5be6f483e16a2acdd ("[S390] introduce
get_clock_monotonic") from the s390 tree and commit
23970e389e9cee43c4b41023935e1417271708b2 ("timekeeping: Introduce
read_boot_clock") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/s390/kernel/time.c
index 6f0d86f,6bff1a1..0000000
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@@ -183,12 -182,14 +183,14 @@@ static void timing_alert_interrupt(__u1
  static void etr_reset(void);
  static void stp_reset(void);
  
- unsigned long read_persistent_clock(void)
+ void read_persistent_clock(struct timespec *ts)
  {
- 	struct timespec ts;
+ 	tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, ts);
+ }
  
- 	tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, &ts);
- 	return ts.tv_sec;
+ void read_boot_clock(struct timespec *ts)
+ {
 -	tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, ts);
++	tod_to_timeval(sched_clock_base - TOD_UNIX_EPOCH, ts);
  }
  
  static cycle_t read_tod_clock(struct clocksource *cs)