[commit: ghc] master: Update parallel submodule, and re-enable warnings (948e03e)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/948e03e55a47a7c5a3566a7f8ba347f590fd8d1f/ghc

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

commit 948e03e55a47a7c5a3566a7f8ba347f590fd8d1f
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Aug 3 08:41:45 2015 +0200

    Update parallel submodule, and re-enable warnings
    
    Test Plan: using remote validate
    
    Reviewers: austin, hvr, simonpj, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1117


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

948e03e55a47a7c5a3566a7f8ba347f590fd8d1f
 libraries/parallel | 2 +-
 mk/warnings.mk     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/parallel b/libraries/parallel
index e4e4228..f606922 160000
--- a/libraries/parallel
+++ b/libraries/parallel
@@ -1 +1 @@
-Subproject commit e4e4228ba94178cf31b97fe81b94bff3de6fce03
+Subproject commit f6069229df73045770fe4521991b9d22fd58e680
diff --git a/mk/warnings.mk b/mk/warnings.mk
index a960e0e..2e82428 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -39,7 +39,6 @@ utils/hpc_dist-install_EXTRA_HC_OPTS += -fwarn-tabs
 
 # Libraries that have dubious RULES
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing
-libraries/parallel_dist-install_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing
 
 # Cabal doesn't promise to be warning-free
 utils/ghc-cabal_dist_EXTRA_HC_OPTS += -w