Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull timer updates from Thomas Gleixner:
 "Yet another big pile of changes:

   - More year 2038 work from Arnd slowly reaching the point where we
     need to think about the syscalls themself.

   - A new timer function which allows to conditionally (re)arm a timer
     only when it's either not running or the new expiry time is sooner
     than the armed expiry time. This allows to use a single timer for
     multiple timeout requirements w/o caring about the first expiry
     time at the call site.

   - A new NMI safe accessor to clock real time for the printk timestamp
     work. Can be used by tracing, perf as well if required.

   - A large number of timer setup conversions from Kees which got
     collected here because either maintainers requested so or they
     simply got ignored. As Kees pointed out already there are a few
     trivial merge conflicts and some redundant commits which was
     unavoidable due to the size of this conversion effort.

   - Avoid a redundant iteration in the timer wheel softirq processing.

   - Provide a mechanism to treat RTC implementations depending on their
     hardware properties, i.e. don't inflict the write at the 0.5
     seconds boundary which originates from the PC CMOS RTC to all RTCs.
     No functional change as drivers need to be updated separately.

   - The usual small updates to core code clocksource drivers. Nothing
     really exciting"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (111 commits)
  timers: Add a function to start/reduce a timer
  pstore: Use ktime_get_real_fast_ns() instead of __getnstimeofday()
  timer: Prepare to change all DEFINE_TIMER() callbacks
  netfilter: ipvs: Convert timers to use timer_setup()
  scsi: qla2xxx: Convert timers to use timer_setup()
  block/aoe: discover_timer: Convert timers to use timer_setup()
  ide: Convert timers to use timer_setup()
  drbd: Convert timers to use timer_setup()
  mailbox: Convert timers to use timer_setup()
  crypto: Convert timers to use timer_setup()
  drivers/pcmcia: omap1: Fix error in automated timer conversion
  ARM: footbridge: Fix typo in timer conversion
  drivers/sgi-xp: Convert timers to use timer_setup()
  drivers/pcmcia: Convert timers to use timer_setup()
  drivers/memstick: Convert timers to use timer_setup()
  drivers/macintosh: Convert timers to use timer_setup()
  hwrng/xgene-rng: Convert timers to use timer_setup()
  auxdisplay: Convert timers to use timer_setup()
  sparc/led: Convert timers to use timer_setup()
  mips: ip22/32: Convert timers to use timer_setup()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-ixp4xx/dsmg600-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nas100d-setup.c
Simple merge

diff --cc arch/m68k/mac/macboing.c
Simple merge

diff --cc arch/powerpc/kernel/watchdog.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/s390/kernel/topology.c
Simple merge

diff --cc drivers/auxdisplay/img-ascii-lcd.c
Simple merge

diff --cc drivers/clocksource/timer-fttmr010.c
Simple merge

diff --cc drivers/clocksource/timer-of.h
Simple merge

diff --cc drivers/crypto/axis/artpec6_crypto.c
Simple merge

diff --cc drivers/ide/ide-probe.c
Simple merge

diff --cc drivers/net/cris/eth_v10.c
Simple merge

diff --cc drivers/ras/cec.c
Simple merge

diff --cc drivers/s390/char/tape.h
Simple merge

diff --cc drivers/s390/char/tape_std.c
Simple merge

diff --cc drivers/s390/net/lcs.c
Simple merge

diff --cc drivers/s390/net/lcs.h
Simple merge

diff --cc drivers/scsi/libiscsi.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_erl0.h
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_erl1.h
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_login.h
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_util.h
Simple merge

diff --cc drivers/usb/misc/usbtest.c
Simple merge

diff --cc fs/ncpfs/ncp_fs_sb.h
Simple merge

diff --cc fs/ncpfs/sock.c
Simple merge

diff --cc include/linux/ide.h
Simple merge

diff --cc include/linux/kthread.h
Simple merge

diff --cc include/linux/rtc.h
Simple merge

diff --cc include/linux/time.h
Simple merge

diff --cc include/linux/time64.h
Simple merge

diff --cc include/linux/timekeeper_internal.h
Simple merge

diff --cc include/linux/timekeeping.h
Simple merge

diff --cc include/linux/timer.h
Simple merge

diff --cc include/linux/workqueue.h
Simple merge

diff --cc kernel/irq/spurious.c
Simple merge

diff --cc kernel/rcu/rcutorture.c
Simple merge

diff --cc kernel/rcu/tree_plugin.h
Simple merge

diff --cc kernel/time/ntp.c
Simple merge

diff --cc kernel/time/ntp_internal.h
Simple merge

diff --cc kernel/time/timekeeping.h
Simple merge

diff --cc kernel/workqueue.c
index 13f67b5a0a0cb932922ed88cbb806c749789fa64,6e5eed58f215db9f29939f930251c54cbeebdd72..7368b57842ea349ca0c1183f6999ec7f16e6c647
--- 1/kernel/workqueue.c
--- 2/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -3223,12 -3241,11 +3222,10 @@@ static int init_worker_pool(struct work
        INIT_LIST_HEAD(&pool->idle_list);
        hash_init(pool->busy_hash);
  
-       setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
-                              (unsigned long)pool);
+       timer_setup(&pool->idle_timer, idle_worker_timeout, TIMER_DEFERRABLE);
  
-       setup_timer(&pool->mayday_timer, pool_mayday_timeout,
-                   (unsigned long)pool);
+       timer_setup(&pool->mayday_timer, pool_mayday_timeout, 0);
  
 -      mutex_init(&pool->manager_arb);
        mutex_init(&pool->attach_mutex);
        INIT_LIST_HEAD(&pool->workers);
  

diff --cc lib/random32.c
Simple merge

diff --cc net/ipv6/ip6_flowlabel.c
Simple merge

diff --cc security/keys/gc.c
Simple merge