After chatting with James in person, I'm resending the full set with the fixes merged in in order to avoid any bisect issues. There should be no functional changes other than avoiding build failures with some configs, and fixing the oops in tracefs.