diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2016-12-25 14:30:04 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2016-12-25 14:30:04 -0800
commit	3ddc76dfc786cc6f87852693227fb0b1f124f807 (patch)
tree	8192b4721e05cf6823087f9696db8c0c8f144b02 /net/tipc/node.c
parent	b272f732f888d4cf43c943a40c9aaa836f9b7431 (diff)
parent	1f3a8e49d8f28f498b8694464623ac20aebfe62a (diff)

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

Pull timer type cleanups from Thomas Gleixner: "This series does a tree wide cleanup of types related to timers/timekeeping. - Get rid of cycles_t and use a plain u64. The type is not really helpful and caused more confusion than clarity - Get rid of the ktime union. The union has become useless as we use the scalar nanoseconds storage unconditionally now. The 32bit timespec alike storage got removed due to the Y2038 limitations some time ago. That leaves the odd union access around for no reason. Clean it up. Both changes have been done with coccinelle and a small amount of manual mopping up" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ktime: Get rid of ktime_equal() ktime: Cleanup ktime_set() usage ktime: Get rid of the union clocksource: Use a plain u64 instead of cycle_t

Diffstat (limited to 'net/tipc/node.c')


context:
space:
mode: