* linux-next: manual merge of the device-mapper tree with the md tree
@ 2013-07-03 4:05 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-07-03 4:05 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, linux-kernel, Mikulas Patocka, NeilBrown
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
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@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-07-03 4:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-03 4:05 linux-next: manual merge of the device-mapper tree with the md tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox