Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added remaining linux/wireless.h struct and constants #3441

Merged
merged 1 commit into from
Jan 28, 2024

Conversation

Brijeshkrishna
Copy link
Contributor

Added remaining wireless struct and constants to Linux.

@rustbot
Copy link
Collaborator

rustbot commented Nov 12, 2023

r? @JohnTitor

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

@Brijeshkrishna
Copy link
Contributor Author

@JohnTitor any changes

@Brijeshkrishna
Copy link
Contributor Author

@JohnTitor ?

src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved
src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved
src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved
@rustbot
Copy link
Collaborator

rustbot commented Jan 5, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jan 6, 2024

📌 Commit a4e311b has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 6, 2024

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

@JohnTitor
Copy link
Member

Could you rebase onto main instead of merging? The latest main will trigger full CI.

@Brijeshkrishna Brijeshkrishna force-pushed the linux_wireless branch 2 times, most recently from 821e349 to 0196b92 Compare January 22, 2024 10:48
@JohnTitor JohnTitor enabled auto-merge January 22, 2024 12:26
@JohnTitor JohnTitor disabled auto-merge January 22, 2024 12:31
@JohnTitor JohnTitor closed this Jan 22, 2024
@JohnTitor
Copy link
Member

Re-triggering CI as the config has been changed.

@JohnTitor JohnTitor reopened this Jan 22, 2024
@JohnTitor JohnTitor enabled auto-merge January 22, 2024 12:32
@Brijeshkrishna
Copy link
Contributor Author

@JohnTitor , I think auto merge is not working

@JohnTitor
Copy link
Member

Sorry! It should work now.

@JohnTitor JohnTitor added this pull request to the merge queue Jan 28, 2024
Merged via the queue into rust-lang:main with commit d4c8eee Jan 28, 2024
42 checks passed
@Brijeshkrishna Brijeshkrishna deleted the linux_wireless branch February 3, 2024 15:03
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 17, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
@tgross35 tgross35 mentioned this pull request Nov 18, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants