Merge ^/vendor/lvm-project/master up to its last change (upstream commite26a78e70), and resolve conflicts.
Merge ^/vendor/llvm/dist up to its last change, and resolve conflicts.