Received-SPF: pass (google.com: domain of linux-kernel+bounces-121980-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Wed, 27 Mar 2024 20:32:33 +0000
From: Conor Dooley <conor@kernel.org>
To: =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= <bjorn@kernel.org>
Cc: 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>,
	=?iso-8859-1?Q?Bj=F6rn_T=F6pel?= <bjorn@rivosinc.com>,
	linux-riscv@lists.infradead.org, Andy Chiu <andy.chiu@sifive.com>,
	Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org
Subject: Re: RISC-V for-next/fixes (cont'd from PW sync)
Message-ID: <20240327-irrigate-unread-d9de28174437@spud>
References: <87ttkro3b5.fsf@all.your.base.are.belong.to.us>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="+H3UkLQ2ywM6BKxo"
Content-Disposition: inline
In-Reply-To: <87ttkro3b5.fsf@all.your.base.are.belong.to.us>


--+H3UkLQ2ywM6BKxo
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Mar 27, 2024 at 08:57:50PM +0100, Bj=F6rn T=F6pel wrote:
> Hi,
>=20
> 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.
>=20
> 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.
>=20
> Today, the baseline for for-next/fixes is the CURRENT_RELEASE-rc1, and
> features/fixes are based on that.
>=20
> This has IMO a couple of issues:
>=20
> 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).
>=20
> 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!):
>=20
> Netdev (here exchanged to RISC-V trees), fast-forward fixes, and then
> cross-merge fixes into for-next -- for every -rc.
>=20
> E.g., say fixes is submitted for -rc2 to Linus, once he pulls, do:
>=20
>   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.
>=20
> Then pull fixes into for-next:
>=20
>   git pull --tags git://git.kernel.org/pub/scm/linux/kernel/git/riscv/lin=
ux.git fixes
>=20
>=20
> Personally (obviously biased), I think this would be easier for
> contributors. Any downsides from a RISC-V perspective?

After you left, Palmer said he'd go for merging his fixes tag into
for-next after they got merged by Linus. At least I think it was that,
rather than Linus' -rcs...

--+H3UkLQ2ywM6BKxo
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZgSCYQAKCRB4tDGHoIJi
0jSXAQC9hx3TKykVdHY3TVEbOmGffTwUej+VecLBQq9NlaLEaQD8DHwblxB6xvNU
37YujV2wcGemH2l70tsYuN6yZnL1vwg=
=ZRKV
-----END PGP SIGNATURE-----

--+H3UkLQ2ywM6BKxo--