]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
Merge tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Nov 2017 20:15:40 +0000 (12:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Nov 2017 20:15:40 +0000 (12:15 -0800)
commitf08d8bcc12de5a153e587027e77de83662eefb8a
tree301fedc4a3ba056db2699b471f4cb69edc2151d3
parentf3573b8f902c507c721999cc669fbb7e045081b8
parentd4d1fc61eb38ff8e5af657e2d2f2290859a277f2
Merge tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 update from Tony Luck:
 "Stop ia64 being the last holdout using GENERIC_TIME_VSYSCALL_OLD so
  that John Stultz can drop that code"

* tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Update fsyscall gettime to use modern vsyscall_update
arch/ia64/Kconfig
arch/ia64/kernel/asm-offsets.c
arch/ia64/kernel/fsys.S
arch/ia64/kernel/fsyscall_gtod_data.h