Auto merge of #148591 - cuviper:beta-next, r=cuviper

[beta] backports

- Enable file locking support in illumos rust-lang/rust#148322
- Fix `wasm_import_module` attribute cross-crate rust-lang/rust#148363

r? cuviper