Merge "xilinx: versal: fix static failure" into integration