[commit: ghc] wip/kavon-nosplit-llvm: Merge branch 'master' into wip/kavon-nosplit-llvm (4a6eb16)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/4a6eb165ba46f3447d44f1550c9e5e2e2d4bc421/ghc

>---------------------------------------------------------------

commit 4a6eb165ba46f3447d44f1550c9e5e2e2d4bc421
Merge: 5eae140 d9d4632
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Wed Mar 7 18:17:21 2018 -0600

    Merge branch 'master' into wip/kavon-nosplit-llvm
    
    Resolved Conflicts in:
    	compiler/cmm/CmmCommonBlockElim.hs
    
    Merged up to: d9d463289fe20316cff12a8f0dbf414db678fa72



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4a6eb165ba46f3447d44f1550c9e5e2e2d4bc421