linux-next: manual merge of the aio tree with the aio-direct tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxxx

Attachment: pgp4q1_f4svDz.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux