Doug Anderson
2023-Jun-17 17:57 UTC
[Nouveau] patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void
Hi, On Sat, Jun 17, 2023 at 9:15?AM Uwe Kleine-K?nig <u.kleine-koenig at pengutronix.de> wrote:> > [expanding recipents by the other affected persons] > > On Thu, Jun 08, 2023 at 09:08:15AM -0700, Doug Anderson wrote: > > On Thu, Jun 1, 2023 at 8:40?AM Uwe Kleine-K?nig > > <u.kleine-koenig at pengutronix.de> wrote: > > > > > > Hello, > > > > > > On Sun, May 07, 2023 at 06:25:23PM +0200, Uwe Kleine-K?nig wrote: > > > > this patch series adapts the platform drivers below drivers/gpu/drm > > > > to use the .remove_new() callback. Compared to the traditional .remove() > > > > callback .remove_new() returns no value. This is a good thing because > > > > the driver core doesn't (and cannot) cope for errors during remove. The > > > > only effect of a non-zero return value in .remove() is that the driver > > > > core emits a warning. The device is removed anyhow and an early return > > > > from .remove() usually yields a resource leak. > > > > > > > > By changing the remove callback to return void driver authors cannot > > > > reasonably (but wrongly) assume any more that there happens some kind of > > > > cleanup later. > > > > > > I wonder if someone would volunteer to add the whole series to > > > drm-misc-next?! > > > > It looks as if Neil applied quite a few of them already, so I looked > > at what was left... > > > > I'm a little hesitant to just apply the whole kit-and-caboodle to > > drm-misc-next since there are specific DRM trees for a bunch of them > > and it would be better if they landed there. ...so I went through all > > the patches that still applied to drm-misc-next, then used > > 'scripts/get_maintainer.pl --scm' to check if they were maintained > > through drm-misc. That still left quite a few patches. I've applied > > those ones and pushed to drm-misc-next: > > > > 71722685cd17 drm/xlnx/zynqmp_dpsub: Convert to platform remove > > callback returning void > > 1ed54a19f3b3 drm/vc4: Convert to platform remove callback returning void > > b957812839f8 drm/v3d: Convert to platform remove callback returning void > > e2fd3192e267 drm/tve200: Convert to platform remove callback returning void > > 84e6da7ad553 drm/tiny: Convert to platform remove callback returning void > > 34cdd1f691ad drm/tidss: Convert to platform remove callback returning void > > d665e3c9d37a drm/sun4i: Convert to platform remove callback returning void > > 0c259ab19146 drm/stm: Convert to platform remove callback returning void > > 9a865e45884a drm/sti: Convert to platform remove callback returning void > > 3c855610840e drm/rockchip: Convert to platform remove callback returning void > > e41977a83b71 drm/panfrost: Convert to platform remove callback returning void > > cef3776d0b5a drm/panel: Convert to platform remove callback returning void > > bd296a594e87 drm/mxsfb: Convert to platform remove callback returning void > > 38ca2d93d323 drm/meson: Convert to platform remove callback returning void > > fd1457d84bae drm/mcde: Convert to platform remove callback returning void > > 41a56a18615c drm/logicvc: Convert to platform remove callback returning void > > 980ec6444372 drm/lima: Convert to platform remove callback returning void > > 82a2c0cc1a22 drm/hisilicon: Convert to platform remove callback returning void > > c3b28b29ac0a drm/fsl-dcu: Convert to platform remove callback returning void > > a118fc6e71f9 drm/atmel-hlcdc: Convert to platform remove callback returning void > > 9a32dd324c46 drm/aspeed: Convert to platform remove callback returning void > > 2c7d291c498c drm/arm/malidp: Convert to platform remove callback returning void > > a920028df679 drm/arm/hdlcd: Convert to platform remove callback returning void > > 1bf3d76a7d15 drm/komeda: Convert to platform remove callback returning void > > 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 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. Hope that makes sense! -Doug
Uwe Kleine-König
2023-Jun-18 12:39 UTC
[Nouveau] patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void
Hello Doug, 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 at pengutronix.de> wrote: > > > > [expanding recipents by the other affected persons] > > > > On Thu, Jun 08, 2023 at 09:08:15AM -0700, Doug Anderson wrote: > > > On Thu, Jun 1, 2023 at 8:40?AM Uwe Kleine-K?nig > > > <u.kleine-koenig at pengutronix.de> wrote: > > > > > > > > Hello, > > > > > > > > On Sun, May 07, 2023 at 06:25:23PM +0200, Uwe Kleine-K?nig wrote: > > > > > this patch series adapts the platform drivers below drivers/gpu/drm > > > > > to use the .remove_new() callback. Compared to the traditional .remove() > > > > > callback .remove_new() returns no value. This is a good thing because > > > > > the driver core doesn't (and cannot) cope for errors during remove. The > > > > > only effect of a non-zero return value in .remove() is that the driver > > > > > core emits a warning. The device is removed anyhow and an early return > > > > > from .remove() usually yields a resource leak. > > > > > > > > > > By changing the remove callback to return void driver authors cannot > > > > > reasonably (but wrongly) assume any more that there happens some kind of > > > > > cleanup later. > > > > > > > > I wonder if someone would volunteer to add the whole series to > > > > drm-misc-next?! > > > > > > It looks as if Neil applied quite a few of them already, so I looked > > > at what was left... > > > > > > I'm a little hesitant to just apply the whole kit-and-caboodle to > > > drm-misc-next since there are specific DRM trees for a bunch of them > > > and it would be better if they landed there. ...so I went through all > > > the patches that still applied to drm-misc-next, then used > > > 'scripts/get_maintainer.pl --scm' to check if they were maintained > > > through drm-misc. That still left quite a few patches. I've applied > > > those ones and pushed to drm-misc-next: > > > > > > 71722685cd17 drm/xlnx/zynqmp_dpsub: Convert to platform remove > > > callback returning void > > > 1ed54a19f3b3 drm/vc4: Convert to platform remove callback returning void > > > b957812839f8 drm/v3d: Convert to platform remove callback returning void > > > e2fd3192e267 drm/tve200: Convert to platform remove callback returning void > > > 84e6da7ad553 drm/tiny: Convert to platform remove callback returning void > > > 34cdd1f691ad drm/tidss: Convert to platform remove callback returning void > > > d665e3c9d37a drm/sun4i: Convert to platform remove callback returning void > > > 0c259ab19146 drm/stm: Convert to platform remove callback returning void > > > 9a865e45884a drm/sti: Convert to platform remove callback returning void > > > 3c855610840e drm/rockchip: Convert to platform remove callback returning void > > > e41977a83b71 drm/panfrost: Convert to platform remove callback returning void > > > cef3776d0b5a drm/panel: Convert to platform remove callback returning void > > > bd296a594e87 drm/mxsfb: Convert to platform remove callback returning void > > > 38ca2d93d323 drm/meson: Convert to platform remove callback returning void > > > fd1457d84bae drm/mcde: Convert to platform remove callback returning void > > > 41a56a18615c drm/logicvc: Convert to platform remove callback returning void > > > 980ec6444372 drm/lima: Convert to platform remove callback returning void > > > 82a2c0cc1a22 drm/hisilicon: Convert to platform remove callback returning void > > > c3b28b29ac0a drm/fsl-dcu: Convert to platform remove callback returning void > > > a118fc6e71f9 drm/atmel-hlcdc: Convert to platform remove callback returning void > > > 9a32dd324c46 drm/aspeed: Convert to platform remove callback returning void > > > 2c7d291c498c drm/arm/malidp: Convert to platform remove callback returning void > > > a920028df679 drm/arm/hdlcd: Convert to platform remove callback returning void > > > 1bf3d76a7d15 drm/komeda: Convert to platform remove callback returning void > > > > 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.htmlIs 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?> 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.> Hope that makes sense!I hope so, too :-) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | https://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20230618/8e58e238/attachment-0001.sig>
Uwe Kleine-König
2023-Jun-18 14:02 UTC
[Nouveau] patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void
Hello again, On Sun, Jun 18, 2023 at 02:39:15PM +0200, Uwe Kleine-K?nig 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. > > > > 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?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='%(refname)' refs/tags/next-* | while read n; do hn=$(git show $n:Next/SHA1s 2>/dev/null | awk '$1 == "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=x; else merged="-"; fi; echo "$n ($prevhn -> $hn) [$merged]"; fi; prevhn=$hn; done refs/tags/next-20151231 (e8b4855b5dd3e285d0ec18ed15468025abc1be9a -> e112e593b215c394c0303dbf0534db0928e87967) [x] refs/tags/next-20160212 (e24bfdd5052ca65e99fb835838da9d64b36ddc88 -> 382ab95d1af85381d8a5dff09b16a80c7e492534) [x] refs/tags/next-20170613 (18e51064c42ca3945b94dd4652156b62457962bc -> 2d7b56378d32b0cf006f8944cbba4046df45dd25) [x] refs/tags/next-20180406 (3ae7fb202d86b7847f237daa474f3946bdc3b0c6 -> 41613a1a7df27a0aa34bf77d51278bbe8e108a8f) [x] refs/tags/next-20180517 (3131f209468d1514af378dd46eb34123d0af84ff -> 2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4) [x] refs/tags/next-20190320 (e552f0851070fe4975d610a99910be4e9bf5d7bd -> 29054230f3e11ea818eccfa7bb4e4b3e89544164) [x] refs/tags/next-20190617 (9f9b25593ab4197318e3621201588ad8cd525c9b -> b1622cb3be4557fd086831ca7426eafe5f1acc2e) [x] refs/tags/next-20190723 (7aaddd96d5febcf5b24357a326b3038d49a20532 -> d808097627e51d53cf9b1aa13239b5c4a6adaefb) [x] refs/tags/next-20190829 (66c2dee4ae10a2d841c40b9dd9c7141eb23eee76 -> 578d2342ec702e5fb8a77983fabb3754ae3e9660) [x] refs/tags/next-20191004 (d7d44b6fe40a98e960be92ea8617954c2596d140 -> 4092de1ba34eb376791809fb366bc15f8a9e0b7c) [x] refs/tags/next-20191106 (8a537de0f3d8b655cb901c948ed863bf0b23277b -> cea35f5ad5ffac06ea29e0d7a7f748683e1f1b7d) [x] refs/tags/next-20191216 (0a5239985a3bc084738851afdf3fceb7d5651b0c -> d4e6a62d3769ef09bfe116b261a61ef871dea4f9) [x] refs/tags/next-20200123 (73896f60d4865657740c64821a7b18825a9bf96c -> db735fc4036bbe1fbe606819b5f0ff26cc76cdff) [x] refs/tags/next-20200415 (152cce0006abf7e17dfb7dc94896b044bda4e588 -> 74aae1c42f4a7f69934762f9e9f90a3ec335fef2) [x] refs/tags/next-20200521 (5bebaeadb30e8d1ed694bd9b63d4e424d333fe36 -> 0df3ff451287d71c620384eb7bb2cd3a8106412c) [x] refs/tags/next-20200617 (291ddeb621e4a9f1ced8302a777fbd7fbda058c6 -> cfe28f909ddd6ca854568870a7a9b46454e52b6f) [x] refs/tags/next-20200724 (9fadd6d1e2977bbd449d4fb99cde41ed6f71f668 -> 206739119508d5ab4b42ab480ff61a7e6cd72d7c) [x] refs/tags/next-20200924 (ad44c03208e46b83e4ae3269e32c9e524aa71cf8 -> de194561359788871f7d8f5f7797557a2a166b4e) [x] refs/tags/next-20201027 (2580a493a97da4a302cb66251b558bfc04c16e68 -> 70bb9193728627e84e02eb0960b0aa138ae2cef5) [x] refs/tags/next-20201214 (c365d304d69ab2a38e1431323d17a216b7930e32 -> 05faf1559de52465f1e753e31883aa294e6179c1) [x] refs/tags/next-20210211 (5ceeb328637a01e0e54e2618cff129c6a1c31dba -> e2183fb135a7f62d317aa1c61eb3d1919080edba) [x] refs/tags/next-20210319 (5fd3de7a51855e086d9ce9d2d752489e9c15b850 -> 4cf1d8719aab0ad89690abb1d37ecf4552778420) [x] refs/tags/next-20210409 (167b400217121338a2beb78e09e2c77bd95491f5 -> 9c0fed84d5750e1eea6c664e073ffa2534a17743) [x] refs/tags/next-20210615 (a3a5f9d0fb15da90820254ba735491887cc12099 -> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2) [x] refs/tags/next-20210714 (34bd46bcf3de72cbffcdc42d3fa67e543d1c869b -> 35d283658a6196b2057be562096610c6793e1219) [x] refs/tags/next-20210715 (35d283658a6196b2057be562096610c6793e1219 -> 85fd4a8a84316166640102676a356755ddec80e0) [-] refs/tags/next-20210726 (85fd4a8a84316166640102676a356755ddec80e0 -> 03b7c552d081b73ba814eefc257c704b4d096d93) [x] refs/tags/next-20210727 (03b7c552d081b73ba814eefc257c704b4d096d93 -> 87360168759879d68550b0c052bbcc2a0339ff74) [-] refs/tags/next-20210817 (87360168759879d68550b0c052bbcc2a0339ff74 -> 80cbd8808f85017b8aff4b223db68926b470be12) [x] refs/tags/next-20211101 (2b3374306b315be02db0f67d3102a0d1e1357270 -> b3ec8cdf457e5e63d396fe1346cc788cf7c1b578) [x] refs/tags/next-20211117 (bcae3af286f49bf4f6cda03f165fbe530f4a6bed -> a193f3b4e050e35c506a34d0870c838d8e0b0449) [x] refs/tags/next-20211217 (43d5ac7d07023cd133b978de473b3400edad941f -> d6c75c295f67b26fad8ba2e72db80e0f744e9da9) [x] refs/tags/next-20220317 (07f380da3ebd8d84fc866ccf83d93c667fcaaeaa -> f6d790e5a7fe42706756c7fa1686d08d230610fc) [x] refs/tags/next-20220406 (67bae5f28c895f8737a1974c3f31cf12b9170b14 -> 21d139a95682c6ade89a2151e44012c9797c0309) [x] refs/tags/next-20220513 (aebeb02dfccb61d6930112aede2db3db5b8e974e -> 6071c4c2a319da360b0bf2bc397d4fefad10b2c8) [x] refs/tags/next-20220610 (5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155 -> efeeaefe9be56e8ae5e5b4e9ff6d2275ec977ec5) [x] refs/tags/next-20220715 (887ddf3251928dc39bfc58c5c62083d38a633c14 -> c96cfaf8fc02d4bb70727dfa7ce7841a3cff9be2) [x] refs/tags/next-20220818 (2939deac1fa220bc82b89235f146df1d9b52e876 -> 8ba9249396bef37cb68be9e8dee7847f1737db9d) [x] refs/tags/next-20221007 (fdd0640b639070efb58226c96cea5861150e8dce -> 39dd0cc2e5bd0d5188dd69f27e18783cea7ff06a) [x] refs/tags/next-20221122 (e3ddd2d25533d1cc6f9fea421e4a5f16b60b3434 -> 29583dfcd2dd72c766422bd05c16f06c6b1fb356) [x] refs/tags/next-20230106 (03dec92c4f788c54a7c01b40a018f601eb8a6c52 -> 4c00ac500d0edd1a6730c4e8293834a694c1b304) [x] refs/tags/next-20230201 (d023d6f741c85bb00d2ca43d338327fbc150c113 -> aebd8f0c6f8280ba35bc989f4a9ea47469d3589a) [x] refs/tags/next-20230616 (c2807ecb529004ea6f2c2be823c495dc8491e205 -> cf683e8870bd4be0fd6b98639286700a35088660) [-] 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. -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | https://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20230618/bf6174b7/attachment-0001.sig>
Maxime Ripard
2023-Jun-18 14:32 UTC
[Nouveau] patches dropped from drm-misc-next [Was: Re: [PATCH 00/53] drm: Convert to platform remove callback returning] void
On Sun, Jun 18, 2023 at 02:39:15PM +0200, Uwe Kleine-K?nig wrote:> Hello Doug, > > 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 at pengutronix.de> wrote: > > > > > > [expanding recipents by the other affected persons] > > > > > > On Thu, Jun 08, 2023 at 09:08:15AM -0700, Doug Anderson wrote: > > > > On Thu, Jun 1, 2023 at 8:40?AM Uwe Kleine-K?nig > > > > <u.kleine-koenig at pengutronix.de> wrote: > > > > > > > > > > Hello, > > > > > > > > > > On Sun, May 07, 2023 at 06:25:23PM +0200, Uwe Kleine-K?nig wrote: > > > > > > this patch series adapts the platform drivers below drivers/gpu/drm > > > > > > to use the .remove_new() callback. Compared to the traditional .remove() > > > > > > callback .remove_new() returns no value. This is a good thing because > > > > > > the driver core doesn't (and cannot) cope for errors during remove. The > > > > > > only effect of a non-zero return value in .remove() is that the driver > > > > > > core emits a warning. The device is removed anyhow and an early return > > > > > > from .remove() usually yields a resource leak. > > > > > > > > > > > > By changing the remove callback to return void driver authors cannot > > > > > > reasonably (but wrongly) assume any more that there happens some kind of > > > > > > cleanup later. > > > > > > > > > > I wonder if someone would volunteer to add the whole series to > > > > > drm-misc-next?! > > > > > > > > It looks as if Neil applied quite a few of them already, so I looked > > > > at what was left... > > > > > > > > I'm a little hesitant to just apply the whole kit-and-caboodle to > > > > drm-misc-next since there are specific DRM trees for a bunch of them > > > > and it would be better if they landed there. ...so I went through all > > > > the patches that still applied to drm-misc-next, then used > > > > 'scripts/get_maintainer.pl --scm' to check if they were maintained > > > > through drm-misc. That still left quite a few patches. I've applied > > > > those ones and pushed to drm-misc-next: > > > > > > > > 71722685cd17 drm/xlnx/zynqmp_dpsub: Convert to platform remove > > > > callback returning void > > > > 1ed54a19f3b3 drm/vc4: Convert to platform remove callback returning void > > > > b957812839f8 drm/v3d: Convert to platform remove callback returning void > > > > e2fd3192e267 drm/tve200: Convert to platform remove callback returning void > > > > 84e6da7ad553 drm/tiny: Convert to platform remove callback returning void > > > > 34cdd1f691ad drm/tidss: Convert to platform remove callback returning void > > > > d665e3c9d37a drm/sun4i: Convert to platform remove callback returning void > > > > 0c259ab19146 drm/stm: Convert to platform remove callback returning void > > > > 9a865e45884a drm/sti: Convert to platform remove callback returning void > > > > 3c855610840e drm/rockchip: Convert to platform remove callback returning void > > > > e41977a83b71 drm/panfrost: Convert to platform remove callback returning void > > > > cef3776d0b5a drm/panel: Convert to platform remove callback returning void > > > > bd296a594e87 drm/mxsfb: Convert to platform remove callback returning void > > > > 38ca2d93d323 drm/meson: Convert to platform remove callback returning void > > > > fd1457d84bae drm/mcde: Convert to platform remove callback returning void > > > > 41a56a18615c drm/logicvc: Convert to platform remove callback returning void > > > > 980ec6444372 drm/lima: Convert to platform remove callback returning void > > > > 82a2c0cc1a22 drm/hisilicon: Convert to platform remove callback returning void > > > > c3b28b29ac0a drm/fsl-dcu: Convert to platform remove callback returning void > > > > a118fc6e71f9 drm/atmel-hlcdc: Convert to platform remove callback returning void > > > > 9a32dd324c46 drm/aspeed: Convert to platform remove callback returning void > > > > 2c7d291c498c drm/arm/malidp: Convert to platform remove callback returning void > > > > a920028df679 drm/arm/hdlcd: Convert to platform remove callback returning void > > > > 1bf3d76a7d15 drm/komeda: Convert to platform remove callback returning void > > > > > > 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. 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. Maxime -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20230618/0a6b8456/attachment-0001.sig>