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: <20100602140322.7e374a2e.sfr@canb.auug.org.au>
Date:	Wed, 2 Jun 2010 14:03:22 +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 <axboe@...nel.dk>,
	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>
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
fs/fs-writeback.c between commit f17625b318d9b151e7bd41e31223e9d89b2aaa77
("Revert "writeback: ensure that WB_SYNC_NONE writeback with sb pinned is
sync"") from the block tree and commits
5c92877730b509fefc445bbba6b3bc441c2c272a ("writeback: fix early free of
work struct") and dff38fd3d1d0914ac0715445bbe21fbce9abed15 ("writeback:
fix non-integrity write-back") from the drbd tree.

I suspect this is caused because the drbd tree id based on a different
version of the block tree to what is in the block tree for-next branch.
I just used the version of this file from the block tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped