Re: linux-next: manual merge of the drbd tree with the block tree

From: Jens Axboe
Date: Tue May 18 2010 - 09:05:53 EST

On Tue, May 18 2010, Philipp Reisner wrote:
> Hi Stephen,
> FYI:
> I use
> git:// for-jens
> as path of my patches to Jens.
> I switched that tree to Jens'
> git:// for-2.6.35
> and provided the DRBD patches on top of that.
> Not that I am not willing to help, I have the feeling that this
> merge conflict has nothing to do with DRBD.

I suspect that the merge will go smoothly with the updated branches when
Stephen runs his scripts tomorrow.

Jens Axboe

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at