Did you try the parallel branches that automatically track upstream LLVM changes? For swift, that is the master-next branch. For llvm/clang, you need to checkout the upstream-with-swift branches. Please keep in mind that testing of these branches is minimal, so there might be other problems. If you want a change cherry-picked into the Swift stable branch of LLVM, try asking @Bob_Wilson.
The stable branch is automatically kept in sync with the latest release branch (currently swift-5.1-branch), so you should never need to update stable directly.