Sigh. And now there's a patch conflict in a regression test expected output: sysviews.out
Please rebase. Incidentally, make sure to check the expected output is actually correct. It's easy to "fix" an expected output to accidentally just memorialize an incorrect output. Btw, it's the last week before feature freeze so time is of the essence.
