git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Al Viro <viro@zeniv.linux.org.uk>
	Mon, 30 Mar 2015 15:12:54 +0000 (11:12 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Mon, 30 Mar 2015 15:14:30 +0000 (11:14 -0400)
commit	086e4508d0bcaeb68bfa0a2f5998abc939653f36
tree	956622de44eeb93c8f3db641aeebd41ff8eb6721	tree \| snapshot
parent	e2e40f2c1ed433c5e224525c8c862fd32e5d3df2	commit \| diff
parent	d482994fca82380912b3a80201b74d5118ff0487	commit \| diff

Merge remote-tracking branch 'net/master' 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>

22 files changed:

arch/s390/hypfs/inode.c	diff1 \|	diff2 \|	blob \| history
crypto/algif_skcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_file_ops.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	diff1 \|	diff2 \|	blob \| history
fs/aio.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/file.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/indirect.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/fuse/dev.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/direct.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/s390/hypfs/inode.c	diff1 \|	diff2 \|	blob \| history
crypto/algif_skcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_file_ops.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	diff1 \|	diff2 \|	blob \| history
fs/aio.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/file.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/indirect.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/fuse/dev.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/direct.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history