haku adding dl_iterate_phdr bsd extension

[devnexen]

No description provided.

[rustbot]

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

[JohnTitor]

@bors r+

[bors]

📌 Commit 009dc97 has been approved by JohnTitor

It is now in the queue for this repository.

[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 dl_iterate_phdr_haiku (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 dl_iterate_phdr_haiku --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 src/unix/haiku/mod.rs
CONFLICT (content): Merge conflict in src/unix/haiku/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[JohnTitor]

@bors r+

[bors]

📌 Commit 47b56cd has been approved by JohnTitor

It is now in the queue for this repository.

[bors]

⌛ Testing commit 47b56cd with merge 68e06ad...

[bors]

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 68e06ad to master...