linux-kernel - linux-next: manual merge of the device-mapper tree with the md 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: <20130703140552.7e8ecf58b0578bfa15d58935@canb.auug.org.au>
Date:	Wed, 3 Jul 2013 14:05:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alasdair G Kergon <agk@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mikulas Patocka <mpatocka@...hat.com>,
	NeilBrown <neilb@...e.de>
Subject: linux-next: manual merge of the device-mapper tree with the md tree

Hi Alasdair,

Today's linux-next merge of the device-mapper tree got a conflict in
drivers/md/dm-raid.c between commit 3f6bbd3ffd7b ("dm-raid: silence
compiler warning on rebuilds_per_group") from the md tree and commit
acc946bad465 ("his patch suppresses this warning:") from the
device-mapper tree.

I fixed it up (I just used the md tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped