From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C269EB64DB for ; Mon, 19 Jun 2023 10:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232399AbjFSK4q (ORCPT ); Mon, 19 Jun 2023 06:56:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232135AbjFSK4R (ORCPT ); Mon, 19 Jun 2023 06:56:17 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E59BCD for ; Mon, 19 Jun 2023 03:54:16 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qBCW3-0002p5-95; Mon, 19 Jun 2023 12:53:47 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qBCVz-008UH6-GY; Mon, 19 Jun 2023 12:53:43 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qBCVy-00FYHN-RS; Mon, 19 Jun 2023 12:53:42 +0200 Date: Mon, 19 Jun 2023 12:53:42 +0200 From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= To: Maxime Ripard Cc: Raymond Tan , Heiko =?utf-8?Q?St=C3=BCbner?= , Akhil P Oommen , Linus Walleij , dri-devel@lists.freedesktop.org, Stanislaw Gruszka , Alim Akhtar , Anitha Chrisanthus , Marijn Suijten , Jonathan Hunter , Sumit Semwal , Jerome Brunet , linux-samsung-soc@vger.kernel.org, Robert Foss , Kuninori Morimoto , 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, Rahul T R , Raphael Gallais-Pou , Jani Nikula , Sascha Hauer , etnaviv@lists.freedesktop.org, Yuan Can , Inki Dae , Jessica Zhang , 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 , Alexandre Belloni , 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 , Steven Price , linux-rockchip@lists.infradead.org, Ben Skeggs , Russell King , Alain Volmat , Liu Ying , linux-arm-msm@vger.kernel.org, Nicolas Ferre , 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 , Christophe JAILLET , Brian Starkey , Karol Herbst , Miaoqian Lin , Stefan Agner , Michal Simek , Matthias Brugger , Laurent Pinchart , Andrzej Hajda , Sam Ravnborg , Rob Herring , Xinwei Kong , Jernej Skrabec , Chen-Yu Tsai , Mali DP Maintainers , Joel Stanley , nouveau@lists.freedesktop.org, Orson Zhai , Philipp Zabel , Chun-Kuang Hu , Lyude Paul , Arnd Bergmann , Guo Zhengkui , Liviu Dudau , Alison Wang , Abhinav Kumar , Christian Gmeiner , Mark Brown , Baolin Wang , Paul Cercueil , Tomi Valkeinen , Deepak R Varma , Karol Wachowski , Kieran Bingham , Ricardo Ribalda , Tian Tao , Shawn Guo , Bjorn Andersson , linux-stm32@st-md-mailman.stormreply.com, Emma Anholt , Konrad Dybcio , Alexandre Torgue , Doug Anderson , Liu Shixin , Krzysztof Kozlowski , Laura Nao , David Airlie , Marek Vasut , linux-renesas-soc@vger.kernel.org, Yongqin Liu , Jayshri Pawar , Jonas Karlman , Russell King , Martin Blumenstingl , Qiang Yu , Thomas Zimmermann , Melissa Wen , linux-mediatek@lists.infradead.org, Fabio Estevam , Laurentiu Palcu , linux-tegra@vger.kernel.org, Stephen Boyd , AngeloGioacchino Del Regno , Yannick Fertre , linux-mips@vger.kernel.org, Rob Clark , Philippe Cornu , Daniel Vetter , 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: <20230619105342.ugf5gz26gcalcsi6@pengutronix.de> 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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mvpkprqqq4uvoixx" Content-Disposition: inline In-Reply-To: X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mips@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org --mvpkprqqq4uvoixx Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 19, 2023 at 11:45:37AM +0200, Maxime Ripard wrote: > 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 c= ommit > > > > > > from this series is c2807ecb5290 ("drm/omap: Convert to platfor= m remove > > > > > > callback returning void"). This commit was part for the followi= ng 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 cf683e8870bd4be0fd6b98639286700a350= 88660. > > > > > > Compared to c2807ecb5290 this adds 1149 patches but drops 37 (t= hat are > > > > > > also not included with a different commit id). The 37 patches d= ropped > > > > > > are 13cdd12a9f934158f4ec817cf048fcb4384aa9dc..c2807ecb5290: > > > > > > > > > > > > $ git shortlog -s 13cdd12a9f934158f4ec817cf048fcb4384aa= 9dc..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 d= ropping > > > > > > my/these patches? Can c2807ecb5290 please be merged into drm-mi= sc-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 patch= es > > > > > 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 w= ell 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) w= hen > > > > drm-misc/for-linux-next moves in a non-fast-forward manner? This is= n'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. >=20 > As an excuse for what? Just because the rules for trees in next allow the merged branch to be rewritten, shouldn't be used to justify rewriting the branch. IMHO you still should ensure that only commits make it into any next snapshot via your tree before X-rc1 for some X (e.g. v6.5) that you intend to be included in X-rc1. > > 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.". >=20 > I mean, that's what we're saying and doing? No, on 2023-06-09 I assumed that my patches will go into v6.5-rc1 (as it was part of next-20230609). A few days later however the patches were dropped. The two options that would have made the experience smoother for me are: a) keep c2807ecb5290 in next and send it for v6.5-rc1; or b) keep c2807ecb5290 in a branch that doesn't result it entering next before v6.5-rc1. > > 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. >=20 > But it wasn't dropped, =46rom my POV it was dropped from next as it was part of next between next-20230609 and next-20230615 but not any more since next-20230616. You talk about (not) being dropped from some branch in drm-misc, that's irrelevant for the thing I'm complaining about. > it's still very much to be sent to Linus during the next merge window. "next merge window" as in the one leading to 6.5-rc1? Either we mean different things when we say "next merge window", or there is a misunderstanding I don't see yet. Best regards Uwe --=20 Pengutronix e.K. | Uwe Kleine-K=C3=B6nig = | Industrial Linux Solutions | https://www.pengutronix.de/ | --mvpkprqqq4uvoixx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmSQM7UACgkQj4D7WH0S /k5Ixgf/Xgm0USxBI9N1ZZCA+kshTeAUthayxBg8SxLjieh642COZiY1XJeafq5D 0q+p03nZWDIWbfX9/OZIucjSM5yqLBSowvH88x8xpTpy7byu7BmMV4T+EJ5LGQk2 lgV8cjYF0QrYmMs2A3ALwGahaSL+rI+rv7EMepAYh5ZYrQ1QuNXOTUAGt8Km25fq RGjQnUIMJOaB+24HEkSDBpFBFa1J8I/HbUH2udU8HWJ1rDJrlEk6frRM3tEi3rSk CBOLLDzPWGGdPr4kOZrMoga8GnB0dLbjzVigb4kXbTYjfMHQtY2LX2d7pH45Snqs rrU3Nu2sd/iPuOusJaoyii8/117yjA== =SAIF -----END PGP SIGNATURE----- --mvpkprqqq4uvoixx--