Merge remote-tracking branch 'tip/timers/core' into afs-next
authorDavid Howells <dhowells@redhat.com>
Mon, 13 Nov 2017 15:36:33 +0000 (15:36 +0000)
committerDavid Howells <dhowells@redhat.com>
Mon, 13 Nov 2017 15:36:33 +0000 (15:36 +0000)
These AFS patches need the timer_reduce() patch from timers/core.

Signed-off-by: David Howells <dhowells@redhat.com>
50 files changed:
1  2 
MAINTAINERS
arch/arm/mach-ixp4xx/dsmg600-setup.c
arch/arm/mach-ixp4xx/nas100d-setup.c
arch/m68k/mac/macboing.c
arch/powerpc/kernel/watchdog.c
arch/powerpc/mm/numa.c
drivers/atm/idt77105.c
drivers/atm/iphase.c
drivers/auxdisplay/img-ascii-lcd.c
drivers/clocksource/timer-fttmr010.c
drivers/clocksource/timer-of.h
drivers/crypto/axis/artpec6_crypto.c
drivers/ide/ide-probe.c
drivers/net/cris/eth_v10.c
drivers/net/hamradio/yam.c
drivers/ras/cec.c
drivers/s390/char/tape.h
drivers/s390/char/tape_std.c
drivers/s390/net/lcs.h
drivers/scsi/libiscsi.c
drivers/scsi/qla2xxx/qla_os.c
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
drivers/target/iscsi/iscsi_target_erl0.h
drivers/target/iscsi/iscsi_target_erl1.h
drivers/target/iscsi/iscsi_target_login.h
drivers/target/iscsi/iscsi_target_util.h
drivers/usb/misc/usbtest.c
fs/ncpfs/ncp_fs_sb.h
fs/ncpfs/sock.c
include/linux/ide.h
include/linux/kthread.h
include/linux/rtc.h
include/linux/time.h
include/linux/time64.h
include/linux/timekeeper_internal.h
include/linux/timekeeping.h
include/linux/timer.h
include/linux/workqueue.h
kernel/irq/spurious.c
kernel/time/ntp.c
kernel/time/ntp_internal.h
kernel/time/timekeeping.h
kernel/workqueue.c
lib/random32.c
net/atm/mpc.c
net/decnet/dn_route.c
net/ipv6/ip6_flowlabel.c
net/netfilter/ipvs/ip_vs_conn.c
net/netfilter/ipvs/ip_vs_ctl.c
security/keys/gc.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ncpfs/sock.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge