From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the md tree with the tree Date: Wed, 10 Jun 2009 14:38:01 +1000 Message-ID: <20090610143801.cce5f7cf.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__10_Jun_2009_14_38_01_+1000_ab7S=J9ohlqQM/jW" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:35817 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbZFJEip (ORCPT ); Wed, 10 Jun 2009 00:38:45 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Neil Brown Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andre Noll --Signature=_Wed__10_Jun_2009_14_38_01_+1000_ab7S=J9ohlqQM/jW Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Neil, Today's linux-next merge of the md tree got a conflict in drivers/md/raid5.c between commit 0e6e0271a210817e202c8a4bfffbde3e3c0616d1 ("md/raid5: fix bug in reshape code when chunk_size decreases") from the md-current tree and commit dbf4da18b39fd412a76c3e1b9d7b29c8cc0197fb ("md: convert conf->chunk_size and conf->prev_chunk to sectors") from the md tree. Overlapping changes. I used the version from the md-current tree (stripe_addr+reshape_sectors) as it appears to be newer. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__10_Jun_2009_14_38_01_+1000_ab7S=J9ohlqQM/jW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkovOKoACgkQjjKRsyhoI8xFxQCdFjPeR0O3B+ucEV1IOlAczdfM ftgAn2NPkfil8vVfCUfcEWd7oshGCYfO =0qdP -----END PGP SIGNATURE----- --Signature=_Wed__10_Jun_2009_14_38_01_+1000_ab7S=J9ohlqQM/jW--