Re: [GIT PULL v2] mediatek drm next for 5.8

From: Matthias Brugger <matthias.bgg@gmail.com>
To: Dave Airlie <airlied@gmail.com>, Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Jitao Shi <jitao.shi@mediatek.com>,
	David Airlie <airlied@linux.ie>, Bernard Zhao <bernard@vivo.com>,
	YueHaibing <yuehaibing@huawei.com>,
	DRI Development <dri-devel@lists.freedesktop.org>,
	"moderated list:ARM/Mediatek SoC support"
	<linux-mediatek@lists.infradead.org>,
	Hsin-Yi Wang <hsinyi@chromium.org>,
	Enric Balletbo i Serra <enric.balletbo@collabora.com>,
	Anand K Mistry <amistry@chromium.org>
Subject: Re: [GIT PULL v2] mediatek drm next for 5.8
Date: Fri, 22 May 2020 17:58:19 +0200	[thread overview]
Message-ID: <9870ea53-cdd9-e34c-dcbd-f087f5abf619@gmail.com> (raw)
In-Reply-To: <CAPM=9tzqQ5G82mSACX5speUF2j-8vz7SrOcj7XLsKCjhe3GT6A@mail.gmail.com>

On 20/05/2020 07:46, Dave Airlie wrote:
> On Wed, 20 May 2020 at 15:44, Dave Airlie <airlied@gmail.com> wrote:
>>
>> On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote:
>>>
>>> Hi, Dave & Daniel:
>>>
>>> This include dpi pin mode swap, config mipi_tx current and impedance,
>>> and some fixup. I drop drm_bridge patches in this version.
>>>
>>> The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
>>>   Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
>>> are available in the Git repository at:
>>>   https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git
>>> tags/mediatek-drm-next-5.8
>>> for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664:
>>
>> Did you edit this by hand or pass it through some mailserver that
>> chewed it up, I had to reconstruct this pull from the above bits, I've
>> no idea why it's so messed up in the first place.
> 
> and why does it contain an unexplained backmerge?
> 
>  Merge tag 'v5.7-next-drm-stable' of
> ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux
> into mediatek-drm-next
> 
> Please don't ever backmerge fixes into next pull, without a long
> explaination or if you really need it ask us first,

It's not fixes. I suppose my tagging strategy helps to create confusion. The tag
is v5.7-*next*, which relates to v5.8 (next version after v5.7). Maybe not the
best way to do it.

We had to merge a series that changed the drivers/gpu/drm, drivers/soc and
drivers/clk.
So I took the series through my branch and Chun-Kuang merged a stable tag in his
branch so that he can take commits on top of this changes.

Maybe the explanation comes too late, but I just wanted to clarify.

Regards,
Matthias

> 
> Please resend this again cleaned up.
> 
> Dave.
> 
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
> 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel