Merge upstream patches. Upgrade kernel