Re: [git pull] drm for 6.9-rc1

2024-03-14 Thread Jani Nikula
On Thu, 14 Mar 2024, Dave Airlie wrote: > On Thu, 14 Mar 2024 at 11:49, Linus Torvalds > wrote: >> >> On Tue, 12 Mar 2024 at 21:07, Dave Airlie wrote: >> > >> > I've done a trial merge into your tree from a few hours ago, there >> > are definitely some slighty messy conflicts, I've pushed a samp

Re: [git pull] drm for 6.9-rc1

2024-03-13 Thread Dave Airlie
On Thu, 14 Mar 2024 at 11:49, Linus Torvalds wrote: > > On Tue, 12 Mar 2024 at 21:07, Dave Airlie wrote: > > > > I've done a trial merge into your tree from a few hours ago, there > > are definitely some slighty messy conflicts, I've pushed a sample > > branch here: > > I appreciate your sample m

Re: [git pull] drm for 6.9-rc1

2024-03-13 Thread pr-tracker-bot
The pull request you sent on Wed, 13 Mar 2024 14:06:52 +1000: > https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2024-03-13 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/480e035fc4c714fb5536e64ab9db04fedc89e910 Thank you! -- Deet-doot-dot, I am a bot. ht

Re: [git pull] drm for 6.9-rc1

2024-03-13 Thread Linus Torvalds
On Tue, 12 Mar 2024 at 21:07, Dave Airlie wrote: > > I've done a trial merge into your tree from a few hours ago, there > are definitely some slighty messy conflicts, I've pushed a sample > branch here: I appreciate your sample merges since I like verifying my end result, but I think your merge i