Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.