Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel...