Merge proposals

linux-aws-5.4 in Ubuntu has no merge proposals.