the update to usrloc.patch does not cleanly apply against 4.0 branch, error: modules/usrloc/ul_mod.c: patch does not apply