Re: patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void

From: Maxime Ripard <mripard@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: "Raymond Tan" <raymond.tan@intel.com>,
	"Heiko Stübner" <heiko@sntech.de>,
	"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
	"Akhil P Oommen" <quic_akhilpo@quicinc.com>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	dri-devel@lists.freedesktop.org,
	"Stanislaw Gruszka" <stanislaw.gruszka@linux.intel.com>,
	"Alim Akhtar" <alim.akhtar@samsung.com>,
	"Anitha Chrisanthus" <anitha.chrisanthus@intel.com>,
	"Marijn Suijten" <marijn.suijten@somainline.org>,
	"Steven Price" <steven.price@arm.com>,
	"Sumit Semwal" <sumit.semwal@linaro.org>,
	"Jerome Brunet" <jbrunet@baylibre.com>,
	linux-samsung-soc@vger.kernel.org,
	"Robert Foss" <rfoss@kernel.org>,
	"Karol Herbst" <kherbst@redhat.com>,
	"Samuel Holland" <samuel@sholland.org>,
	"Kevin Hilman" <khilman@baylibre.com>,
	"Maíra Canal" <mcanal@igalia.com>,
	"Javier Martinez Canillas" <javierm@redhat.com>,
	"Kuogee Hsieh" <quic_khsieh@quicinc.com>,
	"Xinliang Liu" <xinliang.liu@linaro.org>,
	"Danilo Krummrich" <dakr@redhat.com>,
	"NXP Linux Team" <linux-imx@nxp.com>,
	linux-sunxi@lists.linux.dev, "Rob Clark" <robdclark@gmail.com>,
	"Rahul T R" <r-ravikumar@ti.com>,
	"Raphael Gallais-Pou" <raphael.gallais-pou@foss.st.com>,
	"Jani Nikula" <jani.nikula@intel.com>,
	"Sascha Hauer" <s.hauer@pengutronix.de>,
	etnaviv@lists.freedesktop.org,
	"Stephen Boyd" <swboyd@chromium.org>,
	"Inki Dae" <inki.dae@samsung.com>,
	"Alain Volmat" <alain.volmat@foss.st.com>,
	"Sean Paul" <sean@poorly.run>,
	"Johan Hovold" <johan+linaro@kernel.org>,
	"Hyun Kwon" <hyun.kwon@xilinx.com>,
	"Andrew Jeffery" <andrew@aj.id.au>,
	"Jingoo Han" <jingoohan1@gmail.com>,
	"Seung-Woo Kim" <sw0312.kim@samsung.com>,
	"Noralf Trønnes" <noralf@tronnes.org>,
	kernel@pengutronix.de, "Alex Deucher" <alexander.deucher@amd.com>,
	freedreno@lists.freedesktop.org,
	"Claudiu Beznea" <claudiu.beznea@microchip.com>,
	"Miaoqian Lin" <linmq006@gmail.com>,
	linux-aspeed@lists.ozlabs.org,
	"Tomi Valkeinen" <tomi.valkeinen@ideasonboard.com>,
	"Thierry Reding" <thierry.reding@gmail.com>,
	"John Stultz" <jstultz@google.com>,
	"Mihail Atanassov" <mihail.atanassov@arm.com>,
	"Liang He" <windhl@126.com>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	lima@lists.freedesktop.org,
	"Chunyan Zhang" <zhang.lyra@gmail.com>,
	"Alexey Brodkin" <abrodkin@synopsys.com>,
	"Minghao Chi" <chi.minghao@zte.com.cn>,
	"Jonathan Hunter" <jonathanh@nvidia.com>,
	linux-rockchip@lists.infradead.org,
	"Ben Skeggs" <bskeggs@redhat.com>,
	"Russell King" <linux+etnaviv@armlinux.org.uk>,
	"Jessica Zhang" <quic_jesszhan@quicinc.com>,
	linux-mips@vger.kernel.org, "Liu Ying" <victor.liu@nxp.com>,
	linux-arm-msm@vger.kernel.org,
	"Wang Jianzheng" <wangjianzheng@vivo.com>,
	linux-amlogic@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	"Neil Armstrong" <neil.armstrong@linaro.org>,
	"Boris Brezillon" <bbrezillon@kernel.org>,
	"Sandy Huang" <hjc@rock-chips.com>,
	"Paul Kocialkowski" <paul.kocialkowski@bootlin.com>,
	"Kyungmin Park" <kyungmin.park@samsung.com>,
	"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
	linux-mediatek@lists.infradead.org,
	"Brian Starkey" <brian.starkey@arm.com>,
	"Kuninori Morimoto" <kuninori.morimoto.gx@renesas.com>,
	"Yuan Can" <yuancan@huawei.com>, "Stefan Agner" <stefan@agner.ch>,
	"Michal Simek" <michal.simek@xilinx.com>,
	linux-tegra@vger.kernel.org,
	"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
	"Andrzej Hajda" <andrzej.hajda@intel.com>,
	"Sam Ravnborg" <sam@ravnborg.org>,
	"Rob Herring" <robh@kernel.org>, "Chen-Yu Tsai" <wens@csie.org>,
	"Jernej Skrabec" <jernej.skrabec@gmail.com>,
	"Xinwei Kong" <kong.kongxinwei@hisilicon.com>,
	"Mali DP Maintainers" <malidp@foss.arm.com>,
	"Joel Stanley" <joel@jms.id.au>,
	nouveau@lists.freedesktop.org, "Orson Zhai" <orsonzhai@gmail.com>,
	"Chun-Kuang Hu" <chunkuang.hu@kernel.org>,
	"Lyude Paul" <lyude@redhat.com>, "Arnd Bergmann" <arnd@arndb.de>,
	"Guo Zhengkui" <guozhengkui@vivo.com>,
	"Konrad Dybcio" <konrad.dybcio@somainline.org>,
	"Alison Wang" <alison.wang@nxp.com>,
	"Abhinav Kumar" <quic_abhinavk@quicinc.com>,
	"Christian Gmeiner" <christian.gmeiner@gmail.com>,
	"Mark Brown" <broonie@kernel.org>,
	"Baolin Wang" <baolin.wang@linux.alibaba.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Liu Shixin" <liushixin2@huawei.com>,
	"Tomi Valkeinen" <tomba@kernel.org>,
	"Deepak R Varma" <drv@mailo.com>,
	"Karol Wachowski" <karol.wachowski@linux.intel.com>,
	"Kieran Bingham" <kieran.bingham+renesas@ideasonboard.com>,
	"Ricardo Ribalda" <ribalda@chromium.org>,
	"Tian Tao" <tiantao6@hisilicon.com>,
	"Shawn Guo" <shawnguo@kernel.org>,
	"Yannick Fertre" <yannick.fertre@foss.st.com>,
	linux-stm32@st-md-mailman.stormreply.com,
	"Emma Anholt" <emma@anholt.net>,
	"Liviu Dudau" <liviu.dudau@arm.com>,
	"Alexandre Torgue" <alexandre.torgue@foss.st.com>,
	"Doug Anderson" <dianders@chromium.org>,
	"Paul Cercueil" <paul@crapouillou.net>,
	"Laura Nao" <laura.nao@collabora.com>,
	"David Airlie" <airlied@gmail.com>, "Marek Vasut" <marex@denx.de>,
	linux-renesas-soc@vger.kernel.org,
	"Yongqin Liu" <yongqin.liu@linaro.org>,
	"Jayshri Pawar" <jpawar@cadence.com>,
	"Jonas Karlman" <jonas@kwiboo.se>,
	"Russell King" <linux@armlinux.org.uk>,
	"Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
	"Philippe Cornu" <philippe.cornu@foss.st.com>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	"Melissa Wen" <mwen@igalia.com>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	"Fabio Estevam" <festevam@gmail.com>,
	"Laurentiu Palcu" <laurentiu.palcu@oss.nxp.com>,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	"AngeloGioacchino Del Regno"
	<angelogioacchino.delregno@collabora.com>,
	"Bjorn Andersson" <andersson@kernel.org>,
	"Nicolas Ferre" <nicolas.ferre@microchip.com>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
	"Qiang Yu" <yuq825@gmail.com>,
	"Philipp Zabel" <p.zabel@pengutronix.de>,
	"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
	"Jyri Sarha" <jyri.sarha@iki.fi>,
	"Lucas Stach" <l.stach@pengutronix.de>
Subject: Re: patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void
Date: Mon, 19 Jun 2023 11:45:37 +0200	[thread overview]
Message-ID: <vxjp5c4wojcvbnp3ghsspwkgrc4mjmskzl56jkuxlgfhcji7kx@m3hg525p7y6a> (raw)
In-Reply-To: <20230618162950.6th2yo66baqay5mv@pengutronix.de>

[-- Attachment #1: Type: text/plain, Size: 5567 bytes --]

On Sun, Jun 18, 2023 at 06:29:50PM +0200, Uwe Kleine-König wrote:
> Hello Maxime,
> 
> 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önig wrote:
> > > On Sat, Jun 17, 2023 at 10:57:23AM -0700, Doug Anderson wrote:
> > > > On Sat, Jun 17, 2023 at 9:15 AM Uwe Kleine-König
> > > > <u.kleine-koenig@pengutronix.de> wrote:
> > > > > Together with the patches that were applied later the topmost commit
> > > > > 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 cf683e8870bd4be0fd6b98639286700a35088660.
> > > > > Compared to c2807ecb5290 this adds 1149 patches but drops 37 (that are
> > > > > also not included with a different commit id). The 37 patches dropped
> > > > > are 13cdd12a9f934158f4ec817cf048fcb4384aa9dc..c2807ecb5290:
> > > > >
> > > > >         $ git shortlog -s 13cdd12a9f934158f4ec817cf048fcb4384aa9dc..c2807ecb5290
> > > > >              1  Christophe JAILLET
> > > > >              2  Jessica Zhang
> > > > >              5  Karol Wachowski
> > > > >              1  Laura Nao
> > > > >             27  Uwe Kleine-König
> > > > >              1  Wang Jianzheng
> > > > >
> > > > >
> > > > > I guess this was done by mistake because nobody told me about dropping
> > > > > my/these patches? Can c2807ecb5290 please be merged into drm-misc-next
> > > > > again?
> > > > 
> > > > 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.
> > > > 
> > > > drm-misc has a bit of a unique model and it's documented fairly well here:
> > > > 
> > > > https://drm.pages.freedesktop.org/maintainer-tools/drm-misc.html
> > > 
> > > 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?
> > 
> > There's no expectation afaik. Any tree merged in linux-next can be
> > rebased, drop a patch, amend one, etc. without any concern.
> 
> 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.
> 
> 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.
> 
> > It's also why linux-next is rebuilt entirely every day.
> > 
> > > > 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 this
> > > > OK. Specifically, when it's late in the linux cycle then drm-misc-next
> > > > is supposed to stop merging to linuxnext. Then, shortly after the
> > > > merge window closes, patches will start flowing again.
> > > > 
> > > > 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.
> > > 
> > > 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.
> > 
> > It's not that complicated.
> > 
> > drm-misc-next is always open, and we start targeting release X + 2 when
> > X-rc6 is released.
> > 
> > This is due to Linus wanting all the commits sent as part of the PR in
> > linux-next for two weeks.
> > 
> > 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.
> 
> So if I were a maintainer of drm-misc, I'd want that no commit from
> drm-misc-next migrates to next after -rc6.
> 
> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]