Roll both patches into one patch file.