fork flo,mako kernel for 4.8 fixes