[commit: ghc] wip/rwbarton-dep-finsts: Only check for conflicts with the actual dependencies (5748518)

[git at git.haskell.org]

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

On branch  : wip/rwbarton-dep-finsts
Link       : http://ghc.haskell.org/trac/ghc/changeset/5748518bf003b5d8cfc5af0f483fe82e691596c6/ghc

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

commit 5748518bf003b5d8cfc5af0f483fe82e691596c6
Author: Reid Barton <rwbarton at gmail.com>
Date:   Wed Jan 11 11:28:32 2017 -0500

    Only check for conflicts with the actual dependencies


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

5748518bf003b5d8cfc5af0f483fe82e691596c6
 compiler/typecheck/FamInst.hs | 59 ++++++++++++++++++++++++++++---------------
 compiler/types/FamInstEnv.hs  | 12 ++++-----
 2 files changed, 44 insertions(+), 27 deletions(-)

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 5748518bf003b5d8cfc5af0f483fe82e691596c6