Merge "incfs: tolerate either ptrdiff_t or size_t for std::span"