Test merge of rust-6.17 for Linus