generic: move accepted patch to backport-5.15