Skip to content

kernel-hci: Backports from kernel 5.18 to core net devlink, intel iidc, devlink, gtp, avf, and ice driver to enable baseline switchdev functionality for 5.15.x ice driver #5165

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

timothymiskell
Copy link

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
Backports from kernel 5.18 rebased on kernel 5.15.102.1 to enable baseline functionality of ice driver with switchdev

Change Log
  • Updates to core net devlink
  • Updates to intel iidc
  • Updates to devlink
  • Updates to gtp
  • Updates to avf and ice
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Local build

@timothymiskell timothymiskell requested a review from a team as a code owner March 28, 2023 19:02
@microsoft-github-policy-service microsoft-github-policy-service bot added the main PR Destined for main label Mar 28, 2023
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add an entry to the changelorg for these changes?

Copy link
Author

Choose a reason for hiding this comment

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

@vinceaperri
Sure, would it be best to amend our original commit message to capture this?

Copy link
Contributor

Choose a reason for hiding this comment

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

No need, but consider updating the PR title since it will become the message of the squash commit when PR completes.

Copy link
Author

Choose a reason for hiding this comment

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

Updated the PR title, feel free to let us know if any additional changes are needed

Copy link
Contributor

@vinceaperri vinceaperri Mar 30, 2023

Choose a reason for hiding this comment

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

Yes, please also add a space-separated entry to the changelog after %changelog at the bottom of kernel-hci.spec:

* Thu Mar 30 2023 YourName <YourEmail> - 5.15.102.1-2
- Add net/ice patches
- Set CONFIG_ICE=m

Copy link
Author

Choose a reason for hiding this comment

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

@vinceaperri
We've updated the changelog as well in kernel-hci.spec. Feel free to let us know if anything additional is needed here.

@timothymiskell timothymiskell changed the title Ice driver dev Backports from kernel 5.18 to core net devlink, intel iidc, devlink, gtp, avf, and ice driver to enable baseline switchdev functionality for 5.15.x ice driver Mar 30, 2023
@@ -9,7 +9,7 @@
Summary: Linux Kernel for HCI
Name: kernel-hci
Version: 5.15.102.1
Release: 1%{?dist}
Release: 2%{?dist}
Copy link
Contributor

Choose a reason for hiding this comment

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

Please also bump the release number in ./SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec

@timothymiskell
Copy link
Author

@vinceaperri
We've corrected the kernel-hci-signed.spec file and have also reviewed the merge conflicts. Please feel free to let us know if anything else is required here.

@vinceaperri
Copy link
Contributor

vinceaperri commented Apr 27, 2023

@vinceaperri We've corrected the kernel-hci-signed.spec file and have also reviewed the merge conflicts. Please feel free to let us know if anything else is required here.

Just what @rlmenge recommended in the other PR -- prefix the PR title with "kernel-hci:" or equivalent to make it obvious this is for the kernel-hci package.

}
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "924d8cc7b0cab74c7e0cf650813ae6d7092f4cac112f92da4b4683f2b1da55f9",
Copy link
Contributor

Choose a reason for hiding this comment

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

The config signature needs to be updated to reflect the merged changes: cf02f71760969df1b47af49e2d4e1d1f46184ce385ee36526ad5074304c67b8f

@timothymiskell timothymiskell changed the title Backports from kernel 5.18 to core net devlink, intel iidc, devlink, gtp, avf, and ice driver to enable baseline switchdev functionality for 5.15.x ice driver kernel-hci: Backports from kernel 5.18 to core net devlink, intel iidc, devlink, gtp, avf, and ice driver to enable baseline switchdev functionality for 5.15.x ice driver May 2, 2023
Correcting config signature to match merged changes
@timothymiskell
Copy link
Author

@vinceaperri
We've adjusted the title to reflect that is specific to the kernel-hci package, and have corrected the config signature in kernel-hci.signatures.json . Feel free to let us know if additional changes are required here.

@PawelWMS PawelWMS requested a review from a team as a code owner December 12, 2024 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
main PR Destined for main
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants