Merge branch 'fixes' into next

We have some dependencies & conflicts between patches in fixes and
things to go in next, both in the radix TLB flush code and the IMC PMU
driver. So merge fixes into next.
This commit is contained in:
Michael Ellerman
2017-11-10 20:55:03 +11:00
15 changed files with 125 additions and 60 deletions

View File

@@ -1477,7 +1477,6 @@ out:
int arch_update_cpu_topology(void)
{
lockdep_assert_cpus_held();
return numa_update_cpu_topology(true);
}