When I was a developer on some enterprise software, our pattern was that while features were developed against the newest codebase, bug-fixing was done against the oldest supported version that exhibited the bug, and then rolled forward from there to all other releases.

This avoided the cherry picking entirely.

(I understand this wouldn't be a good fit for linux kernel development, but it is an approach I've seen work well)