Bugzilla: https://bugzilla.redhat.com/2100482


Upstream Status: RHEL only

Upstream merge commit b00ed48bb0a7c295facf9036135a573a5cdbe7de
Cleaned up a merge conflict in drivers/dma/idxd/device.c

Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>