Update to upstream Linux kernel and bugfix