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.

Sign up for GitHub

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

Jump to bottom

Follow up PR for eventfd shim #3661

Merged

bors merged 1 commit into rust-lang:master from tiif:fix/eventfd

Jun 9, 2024

Contributor

tiif commented Jun 9, 2024

Follow up of #3650

tiif commented

View reviewed changes

src/shims/unix/linux/eventfd.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/shims/unix/linux/eventfd.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/shims/unix/linux/eventfd.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/shims/unix/linux/eventfd.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/shims/unix/linux/eventfd.rs Outdated Show resolved Hide resolved

tiif force-pushed the fix/eventfd branch from b13e5b2 to d354555 Compare

June 9, 2024 10:15

Contributor Author

tiif commented Jun 9, 2024

rustbot added the S-waiting-on-review label

Member

RalfJung commented Jun 9, 2024 •

edited

Loading

Looks good, thanks. :)
There's no need to rebase when there are no conflicts, and github is terrible at dealing with force-pushes, so please only do that when needed.

Please squash.

RalfJung added S-waiting-on-author and removed S-waiting-on-review labels


          Follow up fix for eventfd shim

194a7d3

tiif force-pushed the fix/eventfd branch from 0986ea0 to 194a7d3 Compare

June 9, 2024 11:44

Member

RalfJung commented Jun 9, 2024

Hm, that force-push has a non-empty diff? Did you do squash+rebase?

Member

RalfJung commented Jun 9, 2024 •

edited

Loading

PR looks the same though.
For reviewing it's easier if you don't do rebase unless needed -- including for the final squash; ideally you'll rebase that over the commit the branch is based on, not the latest upstream master.
(One day maybe github can do git-range-diff, but until then we'll all spend a lot of time working around this...)

Contributor

bors commented Jun 9, 2024

📌 Commit 194a7d3 has been approved by RalfJung

It is now in the queue for this repository.

Contributor

bors commented Jun 9, 2024

⌛ Testing commit 194a7d3 with merge 1eb9bae...

Contributor Author

tiif commented Jun 9, 2024

Ah I see. I did rebase on upstream before squash, will prevent doing that next time.

Contributor

bors commented Jun 9, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 1eb9bae to master...

bors merged commit 1eb9bae into rust-lang:master

8 checks passed

tiif deleted the fix/eventfd branch

June 9, 2024 12:47

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-author