From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D3F3BE6D for ; Mon, 19 Jun 2023 09:45:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 082AAC433C9; Mon, 19 Jun 2023 09:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687167940; bh=Lp4u3T+2xiedusJigDkWh4ix2i0wqp11sPPDYaU3Yo0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=uTs+Es5MJdQAH06s+4uVkVptqIjhO5PlC4tbhRLzHbhg/jvVFuwTvNh59ROQwqwlI FXKrTblcrG9mDZ/TJcMmYqLR2B7PXuxSi+QUizGiyfHcrUjYh69jXXHHFYdHc8FQ8Z utFJ+k51BLx2/k90s2dW6WrKqtXXnhUdkuS3Z5CJ1y3d6aKJ4O9d8A122C2R6Ym6c+ cUPXt0Zryk1mw0GYYVLBKXFlKgEGOJiVvQ2x4DktJoUVQCzZow35a2hUPFH9SbumWV hxree4wzoiY6yiZMtFeAigy/yZsqjLyvq4ILxIMoPA7sCEJ1yQVV3K+UaP/p9aEdnF 3Ul7qcM/T/eqA== Date: Mon, 19 Jun 2023 11:45:37 +0200 From: Maxime Ripard To: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= Cc: Raymond Tan , Heiko =?utf-8?Q?St=C3=BCbner?= , Alexandre Belloni , Akhil P Oommen , Linus Walleij , dri-devel@lists.freedesktop.org, Stanislaw Gruszka , Alim Akhtar , Anitha Chrisanthus , Marijn Suijten , Steven Price , Sumit Semwal , Jerome Brunet , linux-samsung-soc@vger.kernel.org, Robert Foss , Karol Herbst , Samuel Holland , Kevin Hilman , =?utf-8?B?TWHDrXJh?= Canal , Javier Martinez Canillas , Kuogee Hsieh , Xinliang Liu , Danilo Krummrich , NXP Linux Team , linux-sunxi@lists.linux.dev, Rob Clark , Rahul T R , Raphael Gallais-Pou , Jani Nikula , Sascha Hauer , etnaviv@lists.freedesktop.org, Stephen Boyd , Inki Dae , Alain Volmat , Sean Paul , Johan Hovold , Hyun Kwon , Andrew Jeffery , Jingoo Han , Seung-Woo Kim , Noralf =?utf-8?Q?Tr=C3=B8nnes?= , kernel@pengutronix.de, Alex Deucher , freedreno@lists.freedesktop.org, Claudiu Beznea , Miaoqian Lin , linux-aspeed@lists.ozlabs.org, Tomi Valkeinen , Thierry Reding , John Stultz , Mihail Atanassov , Liang He , Ville =?utf-8?B?U3lyasOkbMOk?= , lima@lists.freedesktop.org, Chunyan Zhang , Alexey Brodkin , Minghao Chi , Jonathan Hunter , linux-rockchip@lists.infradead.org, Ben Skeggs , Russell King , Jessica Zhang , linux-mips@vger.kernel.org, Liu Ying , linux-arm-msm@vger.kernel.org, Wang Jianzheng , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong , Boris Brezillon , Sandy Huang , Paul Kocialkowski , Kyungmin Park , Maxime Coquelin , linux-mediatek@lists.infradead.org, Brian Starkey , Kuninori Morimoto , Yuan Can , Stefan Agner , Michal Simek , linux-tegra@vger.kernel.org, Laurent Pinchart , Andrzej Hajda , Sam Ravnborg , Rob Herring , Chen-Yu Tsai , Jernej Skrabec , Xinwei Kong , Mali DP Maintainers , Joel Stanley , nouveau@lists.freedesktop.org, Orson Zhai , Chun-Kuang Hu , Lyude Paul , Arnd Bergmann , Guo Zhengkui , Konrad Dybcio , Alison Wang , Abhinav Kumar , Christian Gmeiner , Mark Brown , Baolin Wang , Daniel Vetter , Liu Shixin , Tomi Valkeinen , Deepak R Varma , Karol Wachowski , Kieran Bingham , Ricardo Ribalda , Tian Tao , Shawn Guo , Yannick Fertre , linux-stm32@st-md-mailman.stormreply.com, Emma Anholt , Liviu Dudau , Alexandre Torgue , Doug Anderson , Paul Cercueil , Laura Nao , David Airlie , Marek Vasut , linux-renesas-soc@vger.kernel.org, Yongqin Liu , Jayshri Pawar , Jonas Karlman , Russell King , Martin Blumenstingl , Philippe Cornu , Thomas Zimmermann , Melissa Wen , Christophe JAILLET , Fabio Estevam , Laurentiu Palcu , Matthias Brugger , AngeloGioacchino Del Regno , Bjorn Andersson , Nicolas Ferre , Krzysztof Kozlowski , Qiang Yu , Philipp Zabel , Dmitry Baryshkov , Jyri Sarha , Lucas Stach Subject: Re: patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void Message-ID: References: <20230507162616.1368908-1-u.kleine-koenig@pengutronix.de> <20230601154002.uv2wfatpb7b45duz@pengutronix.de> <20230617161222.wy55pbomnrrlfy5u@pengutronix.de> <20230618123915.hmy66z7e532jhwgk@pengutronix.de> <20230618162950.6th2yo66baqay5mv@pengutronix.de> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="gnbs5xikge2uwekh" Content-Disposition: inline In-Reply-To: <20230618162950.6th2yo66baqay5mv@pengutronix.de> --gnbs5xikge2uwekh Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 18, 2023 at 06:29:50PM +0200, Uwe Kleine-K=C3=B6nig wrote: > Hello Maxime, >=20 > On Sun, Jun 18, 2023 at 04:32:55PM +0200, Maxime Ripard wrote: > > On Sun, Jun 18, 2023 at 02:39:15PM +0200, Uwe Kleine-K=C3=B6nig wrote: > > > On Sat, Jun 17, 2023 at 10:57:23AM -0700, Doug Anderson wrote: > > > > On Sat, Jun 17, 2023 at 9:15=E2=80=AFAM Uwe Kleine-K=C3=B6nig > > > > wrote: > > > > > Together with the patches that were applied later the topmost com= mit > > > > > from this series is c2807ecb5290 ("drm/omap: Convert to platform = remove > > > > > callback returning void"). This commit was part for the following= next > > > > > tags: > > > > > > > > > > $ git tag -l --contains c2807ecb5290 > > > > > next-20230609 > > > > > next-20230613 > > > > > next-20230614 > > > > > next-20230615 > > > > > > > > > > However in next-20230616 they are missing. In next-20230616 > > > > > drm-misc/for-linux-next was cf683e8870bd4be0fd6b98639286700a35088= 660. > > > > > Compared to c2807ecb5290 this adds 1149 patches but drops 37 (tha= t are > > > > > also not included with a different commit id). The 37 patches dro= pped > > > > > are 13cdd12a9f934158f4ec817cf048fcb4384aa9dc..c2807ecb5290: > > > > > > > > > > $ git shortlog -s 13cdd12a9f934158f4ec817cf048fcb4384aa9d= c..c2807ecb5290 > > > > > 1 Christophe JAILLET > > > > > 2 Jessica Zhang > > > > > 5 Karol Wachowski > > > > > 1 Laura Nao > > > > > 27 Uwe Kleine-K=C3=B6nig > > > > > 1 Wang Jianzheng > > > > > > > > > > > > > > > I guess this was done by mistake because nobody told me about dro= pping > > > > > my/these patches? Can c2807ecb5290 please be merged into drm-misc= -next > > > > > again? > > > >=20 > > > > Actually, it was probably a mistake that these patches got merged to > > > > linuxnext during the 4 days that you noticed. However, your patches > > > > aren't dropped and are still present in drm-misc-next. > > > >=20 > > > > drm-misc has a bit of a unique model and it's documented fairly wel= l here: > > > >=20 > > > > https://drm.pages.freedesktop.org/maintainer-tools/drm-misc.html > > >=20 > > > Is there a flaw then in this unique model (or its implementation) when > > > drm-misc/for-linux-next moves in a non-fast-forward manner? This isn't > > > expected, is it? > >=20 > > There's no expectation afaik. Any tree merged in linux-next can be > > rebased, drop a patch, amend one, etc. without any concern. >=20 > I agree that there are no rules broken for a tree that is included in > next and a maintainer is free to rewrite their tree independant of the > tree being included in next. >=20 > Still I think that shouldn't be used as an excuse. As an excuse for what? > For me, if a maintainer puts some patch into next that's a statement > saying (approximately) "I think this patch is fine and I intend to > send it to Linus during the next merge window.". I mean, that's what we're saying and doing? > So my expectation is that if a patch is dropped again from next, there > was a problem and it would be fair if the maintainer tells the > author/submitter about this problem and that the patch was dropped. But it wasn't dropped, it's still very much to be sent to Linus during the next merge window. > So my concern is not about rule breaking, but about the strange signal > that is sent to contributors by including their work in next for some > time and then dropping it again without comment. >=20 > > It's also why linux-next is rebuilt entirely every day. > >=20 > > > > The key is that committers can commit to drm-misc-next _at any time_ > > > > regardless of the merge window. The drm-misc merge strategy makes t= his > > > > OK. Specifically, when it's late in the linux cycle then drm-misc-n= ext > > > > is supposed to stop merging to linuxnext. Then, shortly after the > > > > merge window closes, patches will start flowing again. > > > >=20 > > > > So basically your patches are landed and should even keep the same = git > > > > hashes when they eventually make it to Linux. They just won't land = for > > > > another release cycle of Linux. > > >=20 > > > OK, c2807ecb5290 is still included in drm-misc-next. So while I don't > > > understand the whole model, the patches at least seem to be scheduled= to > > > go in during the next merge window. > >=20 > > It's not that complicated. > >=20 > > drm-misc-next is always open, and we start targeting release X + 2 when > > X-rc6 is released. > >=20 > > This is due to Linus wanting all the commits sent as part of the PR in > > linux-next for two weeks. > >=20 > > In order to converge towards (X + 1)-rc1 in linux-next, as soon as X-rc6 > > is released, we remove drm-misc-next from the linux-next branch. All the > > patches in drm-misc-next that were targetting X + 1 are in drm/next by > > then, so it's not a concern. >=20 > So if I were a maintainer of drm-misc, I'd want that no commit from > drm-misc-next migrates to next after -rc6. >=20 > Also note that the branch head in question (i.e. c2807ecb5290) was > included in next-20230609, while v6.4-rc6 was tagged on Jun 11. So > according to the rules you described c2807ecb5290 could have been > qualified to go into v6.5-rc1?! Yes, could have, but barely missed the last drm-misc-next PR we sent to Dave that usually occurs on Thursday (8/6) so Dave can merge it on Friday (9/6), the last working day before -rc6 was released. Maxime --gnbs5xikge2uwekh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCZJAjwQAKCRDj7w1vZxhR xYaiAQDfltJZK/mNcp80pbD5Rf8rxBnU/bjLH8PwdZ4323+NNAD6An01V/1Zatms 3vBQYpLxFoCG3f+iuR0DoZgvGKSPVAw= =UgXg -----END PGP SIGNATURE----- --gnbs5xikge2uwekh--