linux-kernel - linux-next: manual merge of the md tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20090610143801.cce5f7cf.sfr@canb.auug.org.au>
Date:	Wed, 10 Jun 2009 14:38:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Neil Brown <neilb@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andre Noll <maan@...temlinux.org>
Subject: linux-next: manual merge of the md tree with the  tree

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped