Merge proposals

linux-riscv in Ubuntu has no merge proposals.