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

usm: fixed merged conflicts #20966

Merged
merged 1 commit into from
Nov 20, 2023
Merged

usm: fixed merged conflicts #20966

merged 1 commit into from
Nov 20, 2023

Conversation

guyarb
Copy link
Contributor

@guyarb guyarb commented Nov 20, 2023

What does this PR do?

Fixes compilation issue caused by merging #20947 and #20942
The key parameter was removed from percpu_array defintion

Motivation

Additional Notes

Possible Drawbacks / Trade-offs

Describe how to test/QA your changes

Reviewer's Checklist

  • If known, an appropriate milestone has been selected; otherwise the Triage milestone is set.
  • Use the major_change label if your change either has a major impact on the code base, is impacting multiple teams or is changing important well-established internals of the Agent. This label will be use during QA to make sure each team pay extra attention to the changed behavior. For any customer facing change use a releasenote.
  • A release note has been added or the changelog/no-changelog label has been applied.
  • Changed code has automated tests for its functionality.
  • Adequate QA/testing plan information is provided if the qa/skip-qa label is not applied.
  • At least one team/.. label has been applied, indicating the team(s) that should QA this change.
  • If applicable, docs team has been notified or an issue has been opened on the documentation repo.
  • If applicable, the need-change/operator and need-change/helm labels have been applied.
  • If applicable, the k8s/<min-version> label, indicating the lowest Kubernetes version compatible with this feature.
  • If applicable, the config template has been updated.

@guyarb guyarb added changelog/no-changelog [deprecated] qa/skip-qa - use other qa/ labels [DEPRECATED] Please use qa/done or qa/no-code-change to skip creating a QA card team/usm The USM team labels Nov 20, 2023
@guyarb guyarb added this to the 7.51.0 milestone Nov 20, 2023
@guyarb guyarb requested a review from a team as a code owner November 20, 2023 16:12
@guyarb guyarb merged commit ad3cf2e into main Nov 20, 2023
164 of 171 checks passed
@guyarb guyarb deleted the guy.arbitman/fix-merge-conflicts branch November 20, 2023 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog component/system-probe [deprecated] qa/skip-qa - use other qa/ labels [DEPRECATED] Please use qa/done or qa/no-code-change to skip creating a QA card team/usm The USM team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants