kernel/generic: drop already upstreamed patch