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.

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

Add SIMD metadata in /proc on Linux follow up #16552

Merged
merged 1 commit into from
Sep 20, 2024
Merged

Add SIMD metadata in /proc on Linux follow up #16552

merged 1 commit into from
Sep 20, 2024

Conversation

behlendorf
Copy link
Contributor

Motivation and Context

Follow up for #16530 where I rushed the merge and broke the FreeBSD. Let me clean up my mess.

Description

This change accidentally broke the FreeBSD build due to a conflict between the simd_stat_init()/simd_stat_fini() macro on FreeBSD and the extern function prototype.

How Has This Been Tested?

Locally build on Linux will be checked by the CI for FreeBSD.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@behlendorf
Add SIMD metadata in /proc on Linux follow up
302ae86 
This change accidentally broke the FreeBSD build due to
a conflict between the simd_stat_init()/simd_stat_fini()
macro on FreeBSD and the extern function prototype.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Sep 20, 2024
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 20, 2024
@behlendorf behlendorf merged commit f9d4f1b into openzfs:master Sep 20, 2024
5 of 19 checks passed
mcmilk pushed a commit to mcmilk/zfs that referenced this pull request Sep 21, 2024
@behlendorf @mcmilk
Add SIMD metadata in /proc on Linux follow up
d92d229 
This change accidentally broke the FreeBSD build due to
a conflict between the simd_stat_init()/simd_stat_fini()
macros on FreeBSD and the extern function prototype.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#16552
ptr1337 pushed a commit to CachyOS/zfs that referenced this pull request Nov 14, 2024
@behlendorf @tonyhutter
Add SIMD metadata in /proc on Linux follow up
37c3d83 
This change accidentally broke the FreeBSD build due to
a conflict between the simd_stat_init()/simd_stat_fini()
macros on FreeBSD and the extern function prototype.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#16552
ptr1337 pushed a commit to CachyOS/zfs that referenced this pull request Nov 21, 2024
@behlendorf @tonyhutter
Add SIMD metadata in /proc on Linux follow up
2e646b5 
This change accidentally broke the FreeBSD build due to
a conflict between the simd_stat_init()/simd_stat_fini()
macros on FreeBSD and the extern function prototype.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#16552
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonyhutter tonyhutter tonyhutter approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@behlendorf @tonyhutter