From: Linus Torvalds Date: Mon, 21 Mar 2011 21:13:48 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... X-Git-Tag: firefly_0821_release~7613^2~2124 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b52307ca144881bf9ef1c2610b3f1911472eb467;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/rostedt/linux-2.6-ktest * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest: ktest: Add STOP_TEST_AFTER to stop the test after a period of time ktest: Monitor kernel while running of user tests ktest: Fix bug where the test would not end after failure ktest: Add BISECT_FILES to run git bisect on paths ktest: Add BISECT_SKIP ktest: Add manual bisect ktest: Handle kernels before make oldnoconfig ktest: Start failure timeout on panic too ktest: Print logfile name on failure --- b52307ca144881bf9ef1c2610b3f1911472eb467