Merge remote branch 'origin/master' into ghc-generics

diff --cc compiler/hsSyn/HsBinds.lhs
index f1cdebb,675afa2..9ebede6
--- 1/compiler/hsSyn/HsBinds.lhs
--- 2/compiler/hsSyn/HsBinds.lhs
+++ b/compiler/hsSyn/HsBinds.lhs
@@@ -680,18 -675,12 +680,13 @@@ okClsDclSig (SpecInstSig _) = Fals
  okClsDclSig _               = True        -- All others OK
  
  okInstDclSig :: Sig a -> Bool
 -okInstDclSig (TypeSig _ _)   = False
 -okInstDclSig (FixSig _)      = False
 -okInstDclSig _                     = True
 +okInstDclSig (TypeSig _ _)    = False
 +okInstDclSig (GenericSig _ _) = False
 +okInstDclSig (FixSig _)       = False
 +okInstDclSig _                      = True
  
- sigForThisGroup :: NameSet -> LSig Name -> Bool
- sigForThisGroup ns sig
-   = case sigName sig of
-       Nothing -> False
-       Just n  -> n `elemNameSet` ns
- 
  sigName :: LSig name -> Maybe name
+ -- Used only in Haddock
  sigName (L _ sig) = sigNameNoLoc sig
  
  sigNameNoLoc :: Sig name -> Maybe name    

diff --cc compiler/rename/RnBinds.lhs
Simple merge

diff --cc compiler/typecheck/TcDeriv.lhs
Simple merge

diff --cc compiler/typecheck/TcGenDeriv.lhs
Simple merge