From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Apr 2018 17:21:19 +0000 (-0700)
Subject: Merge tag 'for_linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel... 
X-Git-Tag: v5.15~9039
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb098d50ecc0a4729507ddcc7f4ae98c3703fadd;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for_linus-4.16' of git://git./linux/kernel/git/jwessel/kgdb

Pull kdb updates from Jason Wessel:

 - fix 2032 time access issues and new compiler warnings

 - minor regression test cleanup

 - formatting fixes for end user use of kdb

* tag 'for_linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  kdb: use memmove instead of overlapping memcpy
  kdb: use ktime_get_mono_fast_ns() instead of ktime_get_ts()
  kdb: bl: don't use tab character in output
  kdb: drop newline in unknown command output
  kdb: make "mdr" command repeat
  kdb: use __ktime_get_real_seconds instead of __current_kernel_time
  misc: kgdbts: Display progress of asynchronous tests
---

cb098d50ecc0a4729507ddcc7f4ae98c3703fadd
diff --cc include/linux/timekeeping.h
index 82c219d,588a0e4..9737fbe
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@@ -31,8 -31,8 +31,9 @@@ struct timespec64 get_monotonic_coarse6
  extern void getrawmonotonic64(struct timespec64 *ts);
  extern void ktime_get_ts64(struct timespec64 *ts);
  extern time64_t ktime_get_seconds(void);
+ extern time64_t __ktime_get_real_seconds(void);
  extern time64_t ktime_get_real_seconds(void);
 +extern void ktime_get_active_ts64(struct timespec64 *ts);
  
  extern int __getnstimeofday64(struct timespec64 *tv);
  extern void getnstimeofday64(struct timespec64 *tv);