jlo: move specified files to common; update to match newer kernel