From 5f130fba6ee4ef5a6dd6abc3c295f49c6b2f96be Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Aug 19 2024 14:31:28 +0000 Subject: contributing/kernel-rhel: BZ -> Jira, add RHEL 10 --- diff --git a/docs/contributing/kernel-rhel.md b/docs/contributing/kernel-rhel.md index f464e8b..d432f01 100644 --- a/docs/contributing/kernel-rhel.md +++ b/docs/contributing/kernel-rhel.md @@ -7,7 +7,7 @@ The kernel for CentOS Stream/RHEL 9 is hosted at [redhat/centos-stream/src/kerne This guide follows the practices [documented by the RHEL kernel team](https://redhat.gitlab.io/centos-stream/src/kernel/documentation/). -# Contributing to the RHEL 9 kernel sources +# Contributing to the RHEL 9 and RHEL 10 kernel sources * Get a Fedora account if you don't have one already. * Make sure to follow [this part](https://docs.fedoraproject.org/en-US/package-maintainers/Joining_the_Package_Maintainers/#install_the_developer_client_tools) @@ -25,10 +25,10 @@ This guide follows the practices [documented by the RHEL kernel team](https://re * Create a new branch based on `upstream/main` for the patches to be applied: `git checkout --no-track -b upstream/main` * Generate a list of commits to backport and save it to a file to use with `git-backport`. * For example, for backporting zstd from v5.16, do: `git log --pretty=oneline v5.14..v5.16 lib/zstd | tac > git-backport-zstd-v5.16-patchset` -* [Create a bug for the RHEL kernel for your backport](https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%209&version=CentOS%20Stream&component=kernel). - * Note: the link above might not select `kernel` as a component for you automatically. If it doesn't, just do so manually and select the correct subcomponent when the menu shows up. - * As an example, here's [the one done for the zstd backport from v5.16](http://bugzilla.redhat.com/2034834). -* Use `git-backport` to generate the patch set to apply as commits: `git-backport -a -b -d $PWD/backport-stage-diffs/ -f ` +* [Create a bug for the RHEL kernel for your backport](https://issues.redhat.com). + * Select `RHEL` as project, `kernel` as component and either `CentOS Stream 9` or `CentOS Stream 10` as version + * As an example, here's [the one done for the zstd backport from v5.16](http://bugzilla.redhat.com/2034834) (note that this was in Bugzilla, not in Jira). +* Use `git-backport` to generate the patch set to apply as commits: `git-backport -a -j -d $PWD/backport-stage-diffs/ -f ` * Use `git am` to apply the patch set: `git am $PWD/backport-stage-diffs/` * Push your branch to your fork on GitLab.com * Open a merge request (MR) against [redhat/centos-stream/src/kernel/centos-stream-9](https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9) with your change.