I merged branches this morning and hit a conflict between
commit 1142738572ef3fcf8b169f1c48d94b4a71cc2d97
Author: Andrew Martin <[email protected]>
Date: Thu May 28 10:32:52 2026 -0400
drm/amdkfd: Fix SMI event PID reporting for containers
and
3b347d011773d147b62f84ec60a7824629148be2
Author: Yongqiang Sun <[email protected]>
Date: Wed May 27 09:50:47 2026 -0400
drm/amdkfd: fix SMI event cross-process information leak
In drm-tip right now I've had to effectively revert the latter as it
is not possible to pass a pid/tgid to kfd_smi_event_add anymore.
Please figure this out so we can resolve it in drm-tip properly.
Thanks,
Dave.
