lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <4b1f104f-3b2a-532d-3354-11c68c5b9aa6@amd.com> Date: Wed, 14 Dec 2022 09:05:06 +0100 From: Christian König <christian.koenig@....com> To: Linus Torvalds <torvalds@...ux-foundation.org>, Dave Airlie <airlied@...il.com>, Alex Deucher <alexander.deucher@....com> Cc: Daniel Vetter <daniel.vetter@...ll.ch>, dri-devel <dri-devel@...ts.freedesktop.org>, LKML <linux-kernel@...r.kernel.org> Subject: Re: [git pull] drm for 6.2-rc1 Am 13.12.22 um 21:14 schrieb Linus Torvalds: > On Mon, Dec 12, 2022 at 6:56 PM Dave Airlie <airlied@...il.com> wrote: >> There are a bunch of conflicts, one in amdgpu is a bit nasty, I've >> cc'ed Christian/Alex to make sure they know to check whatever >> resolution you find. The one I have is what we have in drm-tip tree. > Hmm. My merge resolution is slightly different from yours. > > You seem to have basically dropped commit b09d6acba1d9 ("drm/amdgpu: > handle gang submit before VMID"). > > Now, there are other fence changes in the drm tree that may mean that > that commit *should* be dropped, so it's entirely possible that my > resolution which kept that ordering change might be wrong and your > resolution that just took the drm tip code is the right one. > > Christian? Alex? Can you please double-check what I just pushed out? Yeah, that's certainly not correct. The ordering problem b09d6acba1d9 fixed is back there again. I'm like 99% sure that I did the right thing and my local drm-tip certainly at some point had the right conflict resolution because I've used that for testing the change. The last 1% is that it's possible that I only fixed this on the build server and never pushed into the upstream repository. Anyway we need to re-apply b09d6acba1d9 which should be trivial. Thanks, Christian. > > Linus
Powered by blists - more mailing lists