Merge branch 'hwpoison-cleanups' into hwpoison