Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread Alex Deucher
On Wed, Apr 28, 2021 at 8:14 PM Mikita Lipski wrote: > > Hi Linus, > > The patch to fix the warning is here > (https://www.spinics.net/lists/amd-gfx/msg61614.html) > > I guess it just didn't propagate all the way to the release. > Can it still be pulled into 5.13-rc1 release? I'll include it in m

Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread Mikita Lipski
Hi Linus, The patch to fix the warning is here (https://www.spinics.net/lists/amd-gfx/msg61614.html) I guess it just didn't propagate all the way to the release. Can it still be pulled into 5.13-rc1 release? From: Mikita Lipski [why] Previous statement would always evaluate to true making

Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread Linus Torvalds
On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie wrote: > > This is the main drm pull request for 5.13. The usual lots of work all > over the place. [...] > > Mikita Lipski: > drm/amd/display: Add MST capability to trigger_hotplug interface Hmm. I've already merged this, but my clang build shows

Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread Linus Torvalds
On Wed, Apr 28, 2021 at 11:14 AM Daniel Vetter wrote: > > Maybe we're overdoing it a bit, but we're trying to not backmerge all > the time for no reason at all. Oh, I'm not complaining. I think it's reasonable if some particular issue doesn't hold up further development. So my email was more a s

Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread Daniel Vetter
On Wed, Apr 28, 2021 at 7:07 PM Linus Torvalds wrote: > On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie wrote: > > > > There aren't a massive amount of conflicts, only with vmwgfx when I > > did a test merge into your master yesterday, I think you should be > > able to handle them yourself, but let m

Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread pr-tracker-bot
The pull request you sent on Wed, 28 Apr 2021 13:31:59 +1000: > git://anongit.freedesktop.org/drm/drm tags/drm-next-2021-04-28 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/68a32ba14177d4a21c4a9a941cf1d7aea86d436f Thank you! -- Deet-doot-dot, I am a bot. https://ko

Re: [git pull] drm for 5.13-rc1

2021-04-28 Thread Linus Torvalds
On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie wrote: > > There aren't a massive amount of conflicts, only with vmwgfx when I > did a test merge into your master yesterday, I think you should be > able to handle them yourself, but let me know if you want me to push a > merged tree somewhere (or if I