linux-kernel - Re: linux-next: manual merge of the drbd tree with the block 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20100518130545.GZ25951@kernel.dk>
Date:	Tue, 18 May 2010 15:05:46 +0200
From:	Jens Axboe <jens.axboe@...cle.com>
To:	Philipp Reisner <philipp.reisner@...bit.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>, drbd-dev@...ts.linbit.com,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the drbd tree with the block tree

On Tue, May 18 2010, Philipp Reisner wrote:
> Hi Stephen,
> 
> FYI:
> I use 
> git://git.drbd.org/linux-2.6-drbd.git for-jens
> as path of my patches to Jens.
> 
> I switched that tree to Jens' 
> git://git.kernel.dk/linux-2.6-block.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/