Hello Uwe Kleine-König, > -----Original Message----- > From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > Sent: Wednesday, November 29, 2023 1:55 AM > To: Inki Dae <daeinki@xxxxxxxxx> > Cc: linux-samsung-soc@xxxxxxxxxxxxxxx; Daniel Vetter <daniel@xxxxxxxx>; > Jingoo Han <jingoohan1@xxxxxxxxx>; Seung-Woo Kim <sw0312.kim@xxxxxxxxxxx>; > Kyungmin Park <kyungmin.park@xxxxxxxxxxx>; DRI mailing list <dri- > devel@xxxxxxxxxxxxxxxxxxxxx>; Krzysztof Kozlowski > <krzysztof.kozlowski@xxxxxxxxxx>; kernel@xxxxxxxxxxxxxx; Alim Akhtar > <alim.akhtar@xxxxxxxxxxx>; David Airlie <airlied@xxxxxxxxx>; linux-arm- > kernel@xxxxxxxxxxxxxxxxxxx > 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. :) Thanks, Inki Dae > > Best regards > Uwe > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | > https://protect2.fireeye.com/v1/url?k=421afdc5-23671746-421b768a- > 74fe48600158-d04d6f7cf9d099c0&q=1&e=0938fb20-be8e-4a27-af6c- > 9e745ec738c6&u=https%3A%2F%2Fwww.pengutronix.de%2F |
