Hello Inki, On Thu, Dec 07, 2023 at 11:37:44AM +0900, 대인기/Tizen Platform Lab(SR)/삼성전자 wrote: > Hello Uwe Kleine-König, > > > -----Original Message----- > > From: Uwe Kleine-König <u.kleine-koe...@pengutronix.de> > > Sent: Wednesday, November 29, 2023 1:55 AM > > To: Inki Dae <daei...@gmail.com> > > Cc: linux-samsung-...@vger.kernel.org; Daniel Vetter <dan...@ffwll.ch>; > > Jingoo Han <jingooh...@gmail.com>; Seung-Woo Kim <sw0312....@samsung.com>; > > Kyungmin Park <kyungmin.p...@samsung.com>; DRI mailing list <dri- > > de...@lists.freedesktop.org>; Krzysztof Kozlowski > > <krzysztof.kozlow...@linaro.org>; ker...@pengutronix.de; Alim Akhtar > > <alim.akh...@samsung.com>; David Airlie <airl...@gmail.com>; linux-arm- > > ker...@lists.infradead.org > > Subject: Re: [PATCH v3 08/16] drm/exynos: Convert to platform remove > > callback returning void > > > > Hello Inki, > > > > On Wed, Nov 08, 2023 at 08:54:54AM +0100, Uwe Kleine-König wrote: > > > Hello Inki, > > > > > > On Wed, Nov 08, 2023 at 01:16:18PM +0900, Inki Dae wrote: > > > > Sorry for late. There was a merge conflict so I fixed it manually and > > > > merged. And seems your patch description is duplicated so dropped > > > > duplicated one. > > > > > > Ah. I have a template that generates one patch per driver. I guess this > > > is the result of using squash instead of fixup while putting all exynos > > > changes into a single patch. > > > > This patch didn't make it into next yet even though it's included in > > your exynos-drm-next branch at > > https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git. > > > > Is this on purpose? > > drm-exynos tree is not included in the next tree. It was previously > included, but it has been removed. drm-exynos tree is merged into the > mainline through the drm-next tree, but when the drm-next is > synchronized to the next tree, a conflict occurred between the > exynos-drm tree and the drm-next tree. Therefore, I had requested that > drm-exynos tree be removed from the next. Perhaps I was inexperienced > in managing the git tree at that time. :)
That sounds more like a reason to have your tree in next. One of the core motivations of next is to find inter-tree conflicts early. If such a conflict occurs and you only notice it when it's time to send your PR to drm-next (or even later) the pressure to fix the problem is higher. Also for patch contributors it's nice to have a "complete" next, their tests are more expressive then. So I want to encourage you to readd your tree to next. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
signature.asc
Description: PGP signature
