linux glibc add user_fpsimd_struct struct

[devnexen]

No description provided.

[rust-highfive]

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

[Amanieu]

@bors r+

[bors]

📌 Commit 14b1b93 has been approved by Amanieu

[bors]

⌛ Testing commit 14b1b93 with merge cca3524...

[bors]

💥 Test timed out

[Amanieu]

@bors retry

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout user_fpsimd_struct_arm64 (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self user_fpsimd_struct_arm64 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging libc-test/build.rs
CONFLICT (content): Merge conflict in libc-test/build.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #2606) made this pull request unmergeable. Please resolve the merge conflicts.

[JohnTitor]

@bors r=Amanieu

[bors]

📌 Commit a00785a has been approved by Amanieu

[bors]

⌛ Testing commit a00785a with merge 37783e9...

[bors]

💔 Test failed - checks-actions

[JohnTitor]

@bors retry timeout

[bors]

⌛ Testing commit a00785a with merge 51d07d5...

[bors]

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 51d07d5 to master...