kernel: remove already backported patch, fix build