]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
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)
commit81445e63e67a1e98b1c2575fa2b406d4289d2754
tree2d121d1873b3e8ec7b71086c4db2f5cb207a46ec
parentede372dcae15d3ba1d3d52ac45be7a27ce31be28
parentb24591e2fcf852ad7ad2ccf745c8220bf378d312
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>
50 files changed:
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