Fix merge conflicts
Fix merge conflicts after merging linux changes to work with 4.9, only applies with Mako.

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>