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 0D80FEB64D8 for ; Sun, 18 Jun 2023 14:05:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229773AbjFROFa (ORCPT ); Sun, 18 Jun 2023 10:05:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbjFROF3 (ORCPT ); Sun, 18 Jun 2023 10:05:29 -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 DCE5BE45 for ; Sun, 18 Jun 2023 07:05:27 -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 1qAszk-0002xh-Qi; Sun, 18 Jun 2023 16:03:08 +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 1qAszJ-008HxW-4T; Sun, 18 Jun 2023 16:02:41 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qAszI-00FI3d-DW; Sun, 18 Jun 2023 16:02:40 +0200 Date: Sun, 18 Jun 2023 16:02:40 +0200 From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= To: Doug Anderson 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 , Michal Simek , 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 , Liu Ying , linux-arm-msm@vger.kernel.org, Wang Jianzheng , Maxime Ripard , 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 , Javier Martinez Canillas , 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 , Maxime Ripard , 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 , linux-mips@vger.kernel.org, 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: <20230618140240.4gx4hmcf6rv5qvfi@pengutronix.de> References: <20230507162616.1368908-1-u.kleine-koenig@pengutronix.de> <20230601154002.uv2wfatpb7b45duz@pengutronix.de> <20230617161222.wy55pbomnrrlfy5u@pengutronix.de> <20230618123915.hmy66z7e532jhwgk@pengutronix.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eb4c3srj26vyfosz" Content-Disposition: inline In-Reply-To: <20230618123915.hmy66z7e532jhwgk@pengutronix.de> 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 --eb4c3srj26vyfosz Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello again, On Sun, Jun 18, 2023 at 02:39:15PM +0200, Uwe Kleine-K=F6nig wrote: > > 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 well he= re: > >=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? FTR, I checked historic next trees to find other trees where for-linux-next were moved in a non-fast-forward manner[1]. I found: $ git for-each-ref --format=3D'%(refname)' refs/tags/next-* | while read n= ; do hn=3D$(git show $n:Next/SHA1s 2>/dev/null | awk '$1 =3D=3D "drm-misc" = { print $2 }'); if test -z "$hn"; then continue; fi; if test -n "$prevhn" &= & ! git merge-base --is-ancestor "$prevhn" "$hn"; then if git merge-base --= is-ancestor "$hn" linus/master; then merged=3Dx; else merged=3D"-"; fi; ech= o "$n ($prevhn -> $hn) [$merged]"; fi; prevhn=3D$hn; done refs/tags/next-20151231 (e8b4855b5dd3e285d0ec18ed15468025abc1be9a -> e112e= 593b215c394c0303dbf0534db0928e87967) [x] refs/tags/next-20160212 (e24bfdd5052ca65e99fb835838da9d64b36ddc88 -> 382ab= 95d1af85381d8a5dff09b16a80c7e492534) [x] refs/tags/next-20170613 (18e51064c42ca3945b94dd4652156b62457962bc -> 2d7b5= 6378d32b0cf006f8944cbba4046df45dd25) [x] refs/tags/next-20180406 (3ae7fb202d86b7847f237daa474f3946bdc3b0c6 -> 41613= a1a7df27a0aa34bf77d51278bbe8e108a8f) [x] refs/tags/next-20180517 (3131f209468d1514af378dd46eb34123d0af84ff -> 2045b= 22461c07a88dc3d2bab3cbfc6dc0c602fd4) [x] refs/tags/next-20190320 (e552f0851070fe4975d610a99910be4e9bf5d7bd -> 29054= 230f3e11ea818eccfa7bb4e4b3e89544164) [x] refs/tags/next-20190617 (9f9b25593ab4197318e3621201588ad8cd525c9b -> b1622= cb3be4557fd086831ca7426eafe5f1acc2e) [x] refs/tags/next-20190723 (7aaddd96d5febcf5b24357a326b3038d49a20532 -> d8080= 97627e51d53cf9b1aa13239b5c4a6adaefb) [x] refs/tags/next-20190829 (66c2dee4ae10a2d841c40b9dd9c7141eb23eee76 -> 578d2= 342ec702e5fb8a77983fabb3754ae3e9660) [x] refs/tags/next-20191004 (d7d44b6fe40a98e960be92ea8617954c2596d140 -> 4092d= e1ba34eb376791809fb366bc15f8a9e0b7c) [x] refs/tags/next-20191106 (8a537de0f3d8b655cb901c948ed863bf0b23277b -> cea35= f5ad5ffac06ea29e0d7a7f748683e1f1b7d) [x] refs/tags/next-20191216 (0a5239985a3bc084738851afdf3fceb7d5651b0c -> d4e6a= 62d3769ef09bfe116b261a61ef871dea4f9) [x] refs/tags/next-20200123 (73896f60d4865657740c64821a7b18825a9bf96c -> db735= fc4036bbe1fbe606819b5f0ff26cc76cdff) [x] refs/tags/next-20200415 (152cce0006abf7e17dfb7dc94896b044bda4e588 -> 74aae= 1c42f4a7f69934762f9e9f90a3ec335fef2) [x] refs/tags/next-20200521 (5bebaeadb30e8d1ed694bd9b63d4e424d333fe36 -> 0df3f= f451287d71c620384eb7bb2cd3a8106412c) [x] refs/tags/next-20200617 (291ddeb621e4a9f1ced8302a777fbd7fbda058c6 -> cfe28= f909ddd6ca854568870a7a9b46454e52b6f) [x] refs/tags/next-20200724 (9fadd6d1e2977bbd449d4fb99cde41ed6f71f668 -> 20673= 9119508d5ab4b42ab480ff61a7e6cd72d7c) [x] refs/tags/next-20200924 (ad44c03208e46b83e4ae3269e32c9e524aa71cf8 -> de194= 561359788871f7d8f5f7797557a2a166b4e) [x] refs/tags/next-20201027 (2580a493a97da4a302cb66251b558bfc04c16e68 -> 70bb9= 193728627e84e02eb0960b0aa138ae2cef5) [x] refs/tags/next-20201214 (c365d304d69ab2a38e1431323d17a216b7930e32 -> 05faf= 1559de52465f1e753e31883aa294e6179c1) [x] refs/tags/next-20210211 (5ceeb328637a01e0e54e2618cff129c6a1c31dba -> e2183= fb135a7f62d317aa1c61eb3d1919080edba) [x] refs/tags/next-20210319 (5fd3de7a51855e086d9ce9d2d752489e9c15b850 -> 4cf1d= 8719aab0ad89690abb1d37ecf4552778420) [x] refs/tags/next-20210409 (167b400217121338a2beb78e09e2c77bd95491f5 -> 9c0fe= d84d5750e1eea6c664e073ffa2534a17743) [x] refs/tags/next-20210615 (a3a5f9d0fb15da90820254ba735491887cc12099 -> 1bd8a= 7dc28c1c410f1ceefae1f2a97c06d1a67c2) [x] refs/tags/next-20210714 (34bd46bcf3de72cbffcdc42d3fa67e543d1c869b -> 35d28= 3658a6196b2057be562096610c6793e1219) [x] refs/tags/next-20210715 (35d283658a6196b2057be562096610c6793e1219 -> 85fd4= a8a84316166640102676a356755ddec80e0) [-] refs/tags/next-20210726 (85fd4a8a84316166640102676a356755ddec80e0 -> 03b7c= 552d081b73ba814eefc257c704b4d096d93) [x] refs/tags/next-20210727 (03b7c552d081b73ba814eefc257c704b4d096d93 -> 87360= 168759879d68550b0c052bbcc2a0339ff74) [-] refs/tags/next-20210817 (87360168759879d68550b0c052bbcc2a0339ff74 -> 80cbd= 8808f85017b8aff4b223db68926b470be12) [x] refs/tags/next-20211101 (2b3374306b315be02db0f67d3102a0d1e1357270 -> b3ec8= cdf457e5e63d396fe1346cc788cf7c1b578) [x] refs/tags/next-20211117 (bcae3af286f49bf4f6cda03f165fbe530f4a6bed -> a193f= 3b4e050e35c506a34d0870c838d8e0b0449) [x] refs/tags/next-20211217 (43d5ac7d07023cd133b978de473b3400edad941f -> d6c75= c295f67b26fad8ba2e72db80e0f744e9da9) [x] refs/tags/next-20220317 (07f380da3ebd8d84fc866ccf83d93c667fcaaeaa -> f6d79= 0e5a7fe42706756c7fa1686d08d230610fc) [x] refs/tags/next-20220406 (67bae5f28c895f8737a1974c3f31cf12b9170b14 -> 21d13= 9a95682c6ade89a2151e44012c9797c0309) [x] refs/tags/next-20220513 (aebeb02dfccb61d6930112aede2db3db5b8e974e -> 6071c= 4c2a319da360b0bf2bc397d4fefad10b2c8) [x] refs/tags/next-20220610 (5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155 -> efeea= efe9be56e8ae5e5b4e9ff6d2275ec977ec5) [x] refs/tags/next-20220715 (887ddf3251928dc39bfc58c5c62083d38a633c14 -> c96cf= af8fc02d4bb70727dfa7ce7841a3cff9be2) [x] refs/tags/next-20220818 (2939deac1fa220bc82b89235f146df1d9b52e876 -> 8ba92= 49396bef37cb68be9e8dee7847f1737db9d) [x] refs/tags/next-20221007 (fdd0640b639070efb58226c96cea5861150e8dce -> 39dd0= cc2e5bd0d5188dd69f27e18783cea7ff06a) [x] refs/tags/next-20221122 (e3ddd2d25533d1cc6f9fea421e4a5f16b60b3434 -> 29583= dfcd2dd72c766422bd05c16f06c6b1fb356) [x] refs/tags/next-20230106 (03dec92c4f788c54a7c01b40a018f601eb8a6c52 -> 4c00a= c500d0edd1a6730c4e8293834a694c1b304) [x] refs/tags/next-20230201 (d023d6f741c85bb00d2ca43d338327fbc150c113 -> aebd8= f0c6f8280ba35bc989f4a9ea47469d3589a) [x] refs/tags/next-20230616 (c2807ecb529004ea6f2c2be823c495dc8491e205 -> cf683= e8870bd4be0fd6b98639286700a35088660) [-] so up to now it happend only three times (i.e. the lines with [-]) that drm-misc/for-linux-next changed in a non-ff way and the commit wasn't included later in the mainline (and for refs/tags/next-20230616 we assume this will change to [x] during the next merge window) So it seems to happen every few weeks ... Best regards Uwe [1] My collection of historic next tags is incomplete, so there might be more. --=20 Pengutronix e.K. | Uwe Kleine-K=F6nig | Industrial Linux Solutions | https://www.pengutronix.de/ | --eb4c3srj26vyfosz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmSPDn8ACgkQj4D7WH0S /k7L6gf/cytqkBFkHVXDoBVXRxPM1OePNsw21ry/f3tW70K2nNc4HnmoAL9mFRQ8 5wG1yAZjKMasYxKAfcYJMLYLtzHN4Y9Qp8sc1hxVSMIMocvRl3ZIiWzJfreVjIAe 7FTXkufJanMn7c9Qdh/J8JOtKpklVEZUUfRzINRBM+76I5EHPiQbJa6tn5LfA2Th sRsDEpNjPqCakHoSrXXjaI+Hr96WW17ZMBahDJWoTbWsZxgT3iYw66xrHfCtfe9b cvNTvLg1zU7Pss91qpOXPmy20SpgFp+azkcgV4fuRDBBzOWy8o60c+sHOakVGqEt X09GAkhhnxYXlTriqgI34p9H1ew/0g== =v7dB -----END PGP SIGNATURE----- --eb4c3srj26vyfosz--