From: Linus Torvalds Date: Tue, 4 Nov 2014 19:12:25 +0000 (-0800) Subject: Merge tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.13~6352 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1efa82ecb621a819b552cf541fc5169c44816a6d;p=mirror_ubuntu-bionic-kernel.git Merge tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull ftracetest fix from Steven Rostedt: "Running the ftracetests on a machine that had the debugfs file system mounted in two locations caused the ftracetests to fail. This is because the ftracetests script does a grep of the /proc/mounts file to find where the debugfs file system is mounted. If it is mounted twice, then the grep returns two lines instead of just one. This causes the ftracetests to get confused and fail. Use "head -1" to only return the first mount point for debugfs" * tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: ftracetest: Take the first debugfs mount found --- 1efa82ecb621a819b552cf541fc5169c44816a6d