linux-kernel - linux-next: manual merge of the gfs2 tree with Linus' 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: <20110401105545.b2873be4.sfr@canb.auug.org.au>
Date:	Fri, 1 Apr 2011 10:55:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Whitehouse <swhiteho@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jens Axboe <jaxboe@...ionio.com>
Subject: linux-next: manual merge of the gfs2 tree with Linus' tree

Hi Steven,

Today's linux-next merge of the gfs2 tree got a conflict in fs/gfs2/log.c
between commit 721a9602e660 ("block: kill off REQ_UNPLUG") from Linus'
tree and commit 7ef2a4f51303 ("GFS2: Use filemap_fdatawrite() to write
back the AIL") from the gfs2 tree.

The former removed some of the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped