Home
last modified time | relevance | path

Searched hist:"237 dae889051ed4ebf438b08ca6c0e7c54b97774" (Results 1 – 25 of 63) sorted by relevance

123

/openbmc/linux/fs/ocfs2/
H A Daops.hdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/include/linux/
H A Daio.hdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/jfs/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/fuse/
H A Dcuse.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/affs/
H A Dfile.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/bfs/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/9p/
H A Dvfs_addr.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/crypto/
H A Dalgif_skcipher.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/ntfs/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
H A Dfile.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/drivers/infiniband/hw/qib/
H A Dqib_file_ops.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/ext4/
H A Dindirect.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
H A Dpage-io.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/arch/s390/hypfs/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/udf/
H A Dfile.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/hfs/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/drivers/misc/mei/
H A Dmain.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
H A Dpci-me.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/ecryptfs/
H A Dfile.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/drivers/usb/gadget/legacy/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/hfsplus/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/nilfs2/
H A Dinode.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/afs/
H A Dwrite.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/ubifs/
H A Dfile.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>
/openbmc/linux/fs/gfs2/
H A Daops.cdiff 237dae889051ed4ebf438b08ca6c0e7c54b97774 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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: Al Viro <viro@zeniv.linux.org.uk>

123