Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 237dae88 authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'iocb' into for-davem 



trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parents 7abccdba e2e40f2c

arch/s390/hypfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/module.h>

#include <linux/seq_file.h>

#include <linux/mount.h>

#include <linux/aio.h>

#include <linux/uio.h>

#include <asm/ebcdic.h>

#include "hypfs.h"

crypto/algif_skcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void skcipher_async_cb(struct crypto_async_request *req, int err) 
	atomic_dec(&ctx->inflight);

	skcipher_free_async_sgls(sreq);

	kfree(req);

	aio_complete(iocb, err, err);

	iocb->ki_complete(iocb, err, err);

}



static inline int skcipher_sndbuf(struct sock *sk)

drivers/char/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/pfn.h>

#include <linux/export.h>

#include <linux/io.h>

#include <linux/aio.h>

#include <linux/uio.h>



#include <linux/uaccess.h>

drivers/char/tile-srom.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/types.h>	/* size_t */

#include <linux/proc_fs.h>

#include <linux/fcntl.h>	/* O_ACCMODE */

#include <linux/aio.h>

#include <linux/pagemap.h>

#include <linux/hugetlb.h>

#include <linux/uaccess.h>

drivers/infiniband/hw/ipath/ipath_file_ops.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <linux/slab.h>

#include <linux/highmem.h>

#include <linux/io.h>

#include <linux/aio.h>

#include <linux/jiffies.h>

#include <linux/cpu.h>

#include <asm/pgtable.h>