Manually merge myfluxi's kernel updates