linux-kernel - linux-next: manual merge of the aio-direct tree with the vfs 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>] [day] [month] [year] [list]

Date:	Mon, 11 Nov 2013 12:58:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Kleikamp <dave.kleikamp@...cle.com>,
	Al Viro <viro@...iv.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the aio-direct tree with the vfs tree

Hi Dave,

Today's linux-next merge of the aio-direct tree got a conflict in
fs/read_write.c between commit 72c2d5319200 ("file->f_op is never
NULL...") from the vfs tree and commit dd458300240b ("fs: create
file_readable() and file_writable() functions") from the aio-direct tree.

I fixed it up (I used the aio-direct tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped