Merge remote-tracking branch 'tip/timers/core' into afs-next

These AFS patches need the timer_reduce() patch from timers/core.

Signed-off-by: David Howells <dhowells@redhat.com>

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 drivers/atm/idt77105.c
Simple merge

diff --cc drivers/atm/iphase.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/net/hamradio/yam.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.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/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 a2dccfe1acec34bbda97a292344b997055e56d9a,6e5eed58f215db9f29939f930251c54cbeebdd72..3b67c0a0df1623b8f36d8e21397ceca36d456bed
--- 1/kernel/workqueue.c
--- 2/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -3236,12 -3241,11 +3235,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/atm/mpc.c
Simple merge

diff --cc net/decnet/dn_route.c
Simple merge

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

diff --cc net/netfilter/ipvs/ip_vs_conn.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

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