Update dependencies

upstream patch to enable kernel options pending