rebase: apply cocci patch