linux-kernel - linux-next: manual merge of the aio tree with the aio-direct 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]

Message-Id: <20130821172116.f873e18722024300b39a5ae8@canb.auug.org.au>
Date:	Wed, 21 Aug 2013 17:21:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Benjamin LaHaise <bcrl@...ck.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kent Overstreet <koverstreet@...gle.com>,
	Dave Kleikamp <dave.kleikamp@...cle.com>
Subject: linux-next: manual merge of the aio tree with the aio-direct tree

Hi Benjamin,

Today's linux-next merge of the aio tree got a conflict in
fs/nfs/direct.c between commit 072d62aa3a83 ("nfs: simplify swap") from
the aio-direct tree and commit 73a7075e3f6e ("aio: Kill aio_rw_vect_retry
()") from the aio tree.

I fixed it up (the former also removed the line removed by the latter)
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