Prev: ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
Next: ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
From: Mike Snitzer on 6 Jul 2010 10:40
On Tue, Jul 06 2010 at 12:33am -0400,
Stephen Rothwell <sfr(a)canb.auug.org.au> wrote:

> Hi Alasdair,
>
> Today's linux-next merge of the device-mapper tree got a conflict in
> drivers/md/dm.c between commits 9add80db6089272d6bf13ef6b5dc7b3ddda1a887
> ("dm: stop using q->prepare_flush_fn") and
> 5e27e27e73b5bff903b3c30ffd5a0e17eb95c087 ("block: remove
> q->prepare_flush_fn completely") from the block tree and commit
> 90c50ea6a71bcb1bdf1482007932cc7fb0902455
> ("dm-do-not-initialise-full-request-queue-when-bio-based") from the
> device-mapper tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Hi Stephen,

Your fix is correct, thanks for carrying this until Alasdair gets a
chance to pick it up.

Mike
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
Next: ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used