linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20100518152031.9a244971.sfr@canb.auug.org.au>
Date:	Tue, 18 May 2010 15:20:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Philipp Reisner <philipp.reisner@...bit.com>, <drbd-dev@...bit.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jens Axboe <jens.axboe@...cle.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the drbd tree with the block tree

Hi all,

Today's linux-next merge of the drbd tree got a conflict in
mm/page-writeback.c between commit
42bd225c0ba7c95af39293d39a950c48e7e5cb23 (""laptop-mode: Make flushes
per-device" fix") from the block tree and commit
e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: fix WB_SYNC_NONE
writeback from umount") from the drbd tree (via its merge of the block
tree).

I used the next-20100517 version of the block tree today (because the
above conflict was not resolved correctly in the block tree and caused a
build failure), so I will also use the next-20100517 version of the drbd
tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped