Skip to content

Merge hwdb from systemd#219

Merged
bbonev merged 1 commit intoeudev-project:masterfrom
bbonev:hwdb
Jun 6, 2022
Merged

Merge hwdb from systemd#219
bbonev merged 1 commit intoeudev-project:masterfrom
bbonev:hwdb

Conversation

@bbonev
Copy link
Member

@bbonev bbonev commented Apr 5, 2022

All systemd's hwdb changes up to commit 5674b74c4f99e433fd8e7242e9f16f6ddfece94c

@lu-zero
Copy link
Contributor

lu-zero commented Apr 6, 2022

Looks like github added a spurious merge branch =/

@bbonev
Copy link
Member Author

bbonev commented Apr 6, 2022

That wasn't github, I think that I did a rebase on the changes that I pushed without a PR

@ArsenArsen
Copy link
Collaborator

rebase -i + drop would solve that

All systemd's hwdb changes up to commit 5674b74c4f99e433fd8e7242e9f16f6ddfece94c
@bbonev
Copy link
Member Author

bbonev commented May 26, 2022

I had to force push after the rebase... This is an OUI database update from IEEE, should be safe to merge

@bbonev bbonev requested a review from ArsenArsen June 2, 2022 17:18
Copy link
Collaborator

@ArsenArsen ArsenArsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@bbonev bbonev merged commit 639f6b2 into eudev-project:master Jun 6, 2022
@bbonev bbonev deleted the hwdb branch June 11, 2022 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants