[mdadm/f15: 5/5] Merge branch 'master' into f15

[Jes Sorensen]

commit b170c8b0fa88a27c9e87f9de10ee89ba030e5772
Merge: a3253f6 9d26a69
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu Jan 12 13:39:51 2012 +0100

    Merge branch 'master' into f15

 ...k-around-gcc-4.7-s-strict-aliasing-checks.patch |  122 ++++++++++++++++++++
 ...or-ensure-we-retry-soon-when-remove-fails.patch |   92 +++++++++++++++
 ...ke-return-from-read_and_act-more-symbolic.patch |  109 +++++++++++++++++
 mdadm.spec                                         |   14 ++-
 4 files changed, 336 insertions(+), 1 deletions(-)
---
diff --cc mdadm.spec
index 199b285,b04c119..35e3163
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -8,7 -8,12 +8,10 @@@ Source2:     raid-chec
  Source3:     mdadm.rules
  Source4:     mdadm-raid-check-sysconfig
  Source5:     mdadm-cron
 -Source6:     mdmonitor.service
 -Source7:     mdmonitor-takeover.service
  Source8:     mdadm.conf
+ Patch1:      mdadm-3.2.3-Work-around-gcc-4.7-s-strict-aliasing-checks.patch
+ Patch2:      mdadm-3.2.3-monitor-make-return-from-read_and_act-more-symbolic.patch
+ Patch3:      mdadm-3.2.3-monitor-ensure-we-retry-soon-when-remove-fails.patch
  Patch19:     mdadm-3.2.3-udev.patch
  Patch20:     mdadm-2.5.2-static.patch
  URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
@@@ -31,8 -34,21 +34,9 @@@ package.  However, mdadm is a single pr
  almost all functions without a configuration file, though a configuration
  file can be used to help with some common tasks.
  
 -%package sysvinit
 -Group:       System Environment/Base
 -Summary:     SysV init script for mdadm
 -Requires:    %{name} = %{version}-%{release}
 -Requires(post):   /sbin/service
 -Requires(preun):  /sbin/service
 -Requires(postun): /sbin/service
 -
 -%description sysvinit
 -SysV style init script for mdadm. It needs to be installed only if systemd
 -is not used as the system init process.
 -
  %prep
  %setup -q
+ %patch1 -p1 -b .gcc47
  %patch19 -p1 -b .udev
  %patch20 -p1 -b .static
  
@@@ -87,7 -119,18 +91,15 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Thu Jan 12 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-3
+ - Fix case where we have to retry in case a remove fails due to an array
+   being busy
+ - Resolves: bz773337 (rawhide) bz773340 (f16) bz773341 (f15)
+ 
+ * Thu Jan 5 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-2
+ - Workaround for gcc-4.7 strict aliasing breaking the build
+ 
  * Wed Jan 4 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-1
  - Update to upstream 3.2.3
  - Resolves: bz770110 (rawhide) bz771413 (f16) bz759014 (rawhide)