commit the files that were cleanly patched by ls.patch
Manually merge in the changes to Makefile