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

[Jes Sorensen]

commit 5cf54afbebaf07ffd401fdd90b269ca2c9d75ecd
Merge: 3acdc7c 09420a0
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Wed Jan 4 11:24:39 2012 +0100

    Merge branch 'master' into f15

 mdadm-3.1.3-udev.patch                             |   20 ---
 mdadm-3.2.1-version.patch                          |   24 ---
 ...large-devices-from-being-added-to-0.90-ar.patch |  163 ------------------
 ...nused-handle-in-child-process-during-resh.patch |   84 ---------
 ...-component-size-checks-in-validate_super0.patch |   76 ---------
 mdadm-3.2.2-Fix-serious-memory-leak.patch          |  113 -------------
 ...ow-refuse-to-grow-a-0.90-array-beyond-2TB.patch |   77 ---------
 ...emove-race-for-starting-container-devices.patch |   88 ----------
 mdadm-3.2.2-attributes.patch                       |   41 -----
 mdadm-3.2.2-fixbuild.patch                         |   26 ---
 mdadm-3.2.2-hold-lock-during-assemble.patch        |   45 -----
 mdadm-3.2.2-man.patch                              |  178 --------------------
 mdadm-3.2.2-no-sysfs-launch-container.patch        |   26 ---
 mdadm-3.2.2-readd.patch                            |   26 ---
 ...3.2.2-resync-does-not-continue-after-auto.patch |   56 ------
 ...uper0-fix-overflow-when-checking-max-size.patch |   29 ----
 mdadm-3.2.2-writemostly.patch                      |   87 ----------
 mdadm-3.2.3-udev.patch                             |   32 ++++
 mdadm.spec                                         |   44 +----
 19 files changed, 41 insertions(+), 1194 deletions(-)
---
diff --cc mdadm.spec
index 2456c0c,858b868..199b285
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -8,24 -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
- Patch0:      mdadm-3.2.2-man.patch
- Patch1:      mdadm-3.2.1-version.patch
- Patch2:      mdadm-3.2.2-fixbuild.patch
- Patch3:      mdadm-3.2.2-readd.patch
- Patch4:      mdadm-3.2.2-writemostly.patch
- Patch5:      mdadm-3.2.2-attributes.patch
- Patch6:      mdadm-3.2.2-resync-does-not-continue-after-auto.patch
- Patch7:      mdadm-3.2.2-Remove-race-for-starting-container-devices.patch
- Patch8:      mdadm-3.2.2-no-sysfs-launch-container.patch
- Patch9:      mdadm-3.2.2-hold-lock-during-assemble.patch
- Patch10:     mdadm-3.2.2-Fix-component-size-checks-in-validate_super0.patch
- Patch11:     mdadm-3.2.2-Discourage-large-devices-from-being-added-to-0.90-ar.patch
- Patch12:     mdadm-3.2.2-Grow-refuse-to-grow-a-0.90-array-beyond-2TB.patch
- Patch13:     mdadm-3.2.2-super0-fix-overflow-when-checking-max-size.patch
- Patch14:     mdadm-3.2.2-Fix-serious-memory-leak.patch
- Patch15:     mdadm-3.2.2-FIX-Close-unused-handle-in-child-process-during-resh.patch
- Patch19:     mdadm-3.1.3-udev.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/
  License:     GPLv2+
@@@ -47,24 -31,20 +31,8 @@@ 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
- %patch0 -p1 -b .man
- %patch1 -p1 -b .version
- %patch2 -p1 -b .build
- %patch3 -p1 -b .readd
- %patch4 -p1 -b .writemostly
- %patch5 -p1 -b .attributes
- %patch6 -p1 -b .resync
- %patch7 -p1 -b .container
- %patch8 -p1 -b .sysfs
- %patch9 -p1 -b .assemble
- %patch10 -p1 -b .component
- %patch11 -p1 -b .discourage
- %patch12 -p1 -b .grow
- %patch13 -p1 -b .overflow
- %patch14 -p1 -b .memleak
- %patch15 -p1 -b .reshape
  %patch19 -p1 -b .udev
  %patch20 -p1 -b .static
  
@@@ -119,7 -115,16 +87,13 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * 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)
+ - Resolves: bz759015 (f16) bz759035 (rawhide) bz759036 (f16)
+ - Resolves: bz771608 (f15) bz759016 (f15) bz759039 (f15)
+ 
  * Mon Nov 21 2011 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.2-15
  - Backport upstream fix for memory leak that can prevent migration to
    RAID5 from completing.