Merge branch 'smp' into misc