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

[Jes Sorensen]

commit f18b34a57741adcc7b64d5e2eb338aaf263cdc01
Merge: 7d99d7d aa53f3d
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Tue May 15 14:31:30 2012 +0200

    Merge branch 'master' into f15

 mdadm-3.2.4-super1-fix-choice-of-data_offset.patch |   92 ++++++++++++++++++++
 mdadm.spec                                         |    8 ++-
 2 files changed, 99 insertions(+), 1 deletions(-)
---
diff --cc mdadm.spec
index fe24904,7bf6615..1774c4d
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -8,7 -8,10 +8,8 @@@ 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.4-super1-fix-choice-of-data_offset.patch
  # Fedora customization patches
  Patch97:     mdadm-3.2.3-udev.patch
  Patch98:     mdadm-2.5.2-static.patch
@@@ -96,7 -126,14 +98,11 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Tue May 15 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.4-3
+ - Fix mdadm-3.2.4 introduced bug where --add fails in common cases
+ - Resolves bz821717 (f17) bz821718 (f16) bz821719 (f15)
+ 
  * Thu May 10 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.4-2
  - Fix mdadm.conf to use 'd' for /var/run/mdadm creation, to avoid the
    map file getting deleted during boot.