Backport upstream patch that fixes compilation. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Remove upstreamed patch. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Rosen Penev <rosenp@gmail.com>