Michael Ellerman f1079d3a3d Merge branch 'fixes' into next ... We ended up with an ugly conflict between fixes and next in ftrace.h involving multiple nested ifdefs, and the automatic resolution is wrong. So merge fixes into next so we can fix it up.		2018-06-03 20:32:02 +10:00
..
asm	Merge branch 'fixes' into next	2018-06-03 20:32:02 +10:00
uapi/asm	KVM changes for 4.16	2018-02-10 13:16:35 -08:00