generic-ipi: merge fix