From: "Björn Töpel" <bjorn@kernel.org> To: "Conor Dooley" <conor@kernel.org>, "Paul Walmsley" <paul.walmsley@sifive.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Albert Ou" <aou@eecs.berkeley.edu>, "Emil Renner Berthing" <kernel@esmil.dk>, "Samuel Holland" <samuel.holland@sifive.com>, "Alexandre Ghiti" <alexghiti@rivosinc.com>, "Björn Töpel" <bjorn@rivosinc.com>, linux-riscv@lists.infradead.org, "Andy Chiu" <andy.chiu@sifive.com> Cc: Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: RISC-V for-next/fixes (cont'd from PW sync) Date: Wed, 27 Mar 2024 20:57:50 +0100 [thread overview] Message-ID: <87ttkro3b5.fsf@all.your.base.are.belong.to.us> (raw) Hi, I figured I'd put some words on the "how to update the RISC-V for-next/fixes branches [1]" that came up on the patchwork call today. In RISC-V land, the for-next branch is used for features, and typically sent as a couple of PRs to Linus when the merge window is open. The fixes branch is sent as PR(s) between the RCs of a release. Today, the baseline for for-next/fixes is the CURRENT_RELEASE-rc1, and features/fixes are based on that. This has IMO a couple of issues: 1. fixes is missing the non-RISC-V fixes from releases later than -rc1, which makes it harder for contributors. 2. for-next does not have the fixes from RISC-V/rest of the kernel, and it's hard for contributors to test the work on for-next (buggy, no fixes, and sometime missing deps). I used to spend a whole lot of mine time in the netdev tree of the kernel, and this is how they manage it (Thanks Kuba!): Netdev (here exchanged to RISC-V trees), fast-forward fixes, and then cross-merge fixes into for-next -- for every -rc. E.g., say fixes is submitted for -rc2 to Linus, once he pulls, do: git push --delete origin $SOMETAG git tag -d $SOMETAG git pull --ff-only --tags git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git build / test / push out. Then pull fixes into for-next: git pull --tags git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git fixes Personally (obviously biased), I think this would be easier for contributors. Any downsides from a RISC-V perspective? Björn [1] git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
WARNING: multiple messages have this Message-ID (diff)
From: "Björn Töpel" <bjorn@kernel.org> To: "Conor Dooley" <conor@kernel.org>, "Paul Walmsley" <paul.walmsley@sifive.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Albert Ou" <aou@eecs.berkeley.edu>, "Emil Renner Berthing" <kernel@esmil.dk>, "Samuel Holland" <samuel.holland@sifive.com>, "Alexandre Ghiti" <alexghiti@rivosinc.com>, "Björn Töpel" <bjorn@rivosinc.com>, linux-riscv@lists.infradead.org, "Andy Chiu" <andy.chiu@sifive.com> Cc: Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: RISC-V for-next/fixes (cont'd from PW sync) Date: Wed, 27 Mar 2024 20:57:50 +0100 [thread overview] Message-ID: <87ttkro3b5.fsf@all.your.base.are.belong.to.us> (raw) Hi, I figured I'd put some words on the "how to update the RISC-V for-next/fixes branches [1]" that came up on the patchwork call today. In RISC-V land, the for-next branch is used for features, and typically sent as a couple of PRs to Linus when the merge window is open. The fixes branch is sent as PR(s) between the RCs of a release. Today, the baseline for for-next/fixes is the CURRENT_RELEASE-rc1, and features/fixes are based on that. This has IMO a couple of issues: 1. fixes is missing the non-RISC-V fixes from releases later than -rc1, which makes it harder for contributors. 2. for-next does not have the fixes from RISC-V/rest of the kernel, and it's hard for contributors to test the work on for-next (buggy, no fixes, and sometime missing deps). I used to spend a whole lot of mine time in the netdev tree of the kernel, and this is how they manage it (Thanks Kuba!): Netdev (here exchanged to RISC-V trees), fast-forward fixes, and then cross-merge fixes into for-next -- for every -rc. E.g., say fixes is submitted for -rc2 to Linus, once he pulls, do: git push --delete origin $SOMETAG git tag -d $SOMETAG git pull --ff-only --tags git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git build / test / push out. Then pull fixes into for-next: git pull --tags git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git fixes Personally (obviously biased), I think this would be easier for contributors. Any downsides from a RISC-V perspective? Björn [1] git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next reply other threads:[~2024-03-27 19:57 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-27 19:57 Björn Töpel [this message] 2024-03-27 19:57 ` RISC-V for-next/fixes (cont'd from PW sync) Björn Töpel 2024-03-27 20:32 ` Conor Dooley 2024-03-27 20:32 ` Conor Dooley 2024-03-29 6:46 ` Alexandre Ghiti 2024-03-29 6:46 ` Alexandre Ghiti 2024-03-29 7:27 ` Conor Dooley 2024-03-29 7:27 ` Conor Dooley 2024-03-29 9:10 ` Björn Töpel 2024-03-29 9:10 ` Björn Töpel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87ttkro3b5.fsf@all.your.base.are.belong.to.us \ --to=bjorn@kernel.org \ --cc=alexghiti@rivosinc.com \ --cc=andy.chiu@sifive.com \ --cc=aou@eecs.berkeley.edu \ --cc=bjorn@rivosinc.com \ --cc=conor@kernel.org \ --cc=kernel@esmil.dk \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=netdev@vger.kernel.org \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=samuel.holland@sifive.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.