Merge tag 'v4.1.37' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993066AbdABKgmTJ32w/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jan 2 11:22:46 2017 +0100 Commit: 3c2451209aa275293331fc48ba845318620cd279 Gitweb: https://git.linux-mips.org/g/ralf/linux/3c2451209aa2 Branch: linux-4.1-stable --- Documentation/arm/CCN.txt | 2 Documentation/filesystems/porting | 4 - Documentation/sysctl/fs.txt | 7 ++ Makefile | 2 arch/arm/include/asm/dma-mapping.h | 2 arch/x86/include/asm/tlbflush.h | 2 arch/x86/purgatory/Makefile | 1 drivers/bus/arm-ccn.c | 36 ++++++++- drivers/gpu/drm/msm/msm_gem_submit.c | 27 +++++-- drivers/mtd/nand/davinci_nand.c | 3 + drivers/net/can/dev.c | 27 ++++--- drivers/net/vxlan.c | 2 drivers/scsi/arcmsr/arcmsr_hba.c | 8 ++ drivers/scsi/megaraid/megaraid_sas.h | 2 drivers/staging/lustre/lustre/llite/llite_lib.c | 2 fs/9p/acl.c | 40 ++++------ fs/9p/vfs_inode.c | 2 fs/9p/vfs_inode_dotl.c | 2 fs/adfs/inode.c | 2 fs/affs/inode.c | 2 fs/attr.c | 35 ++++++--- fs/btrfs/acl.c | 6 - fs/btrfs/inode.c | 2 fs/ceph/acl.c | 6 - fs/ceph/inode.c | 2 fs/cifs/inode.c | 4 - fs/ecryptfs/inode.c | 2 fs/exofs/inode.c | 2 fs/ext2/acl.c | 12 +-- fs/ext2/inode.c | 2 fs/ext3/inode.c | 2 fs/ext4/acl.c | 12 +-- fs/ext4/ext4.h | 1 fs/ext4/inode.c | 2 fs/ext4/super.c | 3 + fs/ext4/xattr.c | 32 +++++--- fs/f2fs/acl.c | 6 - fs/f2fs/file.c | 2 fs/fat/file.c | 2 fs/fuse/dir.c | 9 +- fs/fuse/file.c | 2 fs/fuse/fuse_i.h | 2 fs/gfs2/acl.c | 12 +-- fs/gfs2/inode.c | 2 fs/hfs/inode.c | 2 fs/hfsplus/inode.c | 2 fs/hfsplus/posix_acl.c | 4 - fs/hostfs/hostfs_kern.c | 2 fs/hpfs/inode.c | 2 fs/hugetlbfs/inode.c | 2 fs/jffs2/acl.c | 9 +- fs/jffs2/fs.c | 2 fs/jfs/acl.c | 6 - fs/jfs/file.c | 2 fs/kernfs/inode.c | 2 fs/libfs.c | 2 fs/logfs/file.c | 2 fs/minix/file.c | 2 fs/mount.h | 2 fs/namespace.c | 49 ++++++++++++ fs/ncpfs/inode.c | 2 fs/nfsd/nfsproc.c | 50 ++++++++++++ fs/nfsd/vfs.c | 36 --------- fs/nilfs2/inode.c | 2 fs/ntfs/inode.c | 2 fs/ocfs2/acl.c | 10 +- fs/ocfs2/dlmfs/dlmfs.c | 2 fs/ocfs2/file.c | 2 fs/omfs/file.c | 2 fs/overlayfs/inode.c | 2 fs/pnode.c | 2 fs/pnode.h | 1 fs/posix_acl.c | 31 ++++++++ fs/proc/base.c | 2 fs/proc/generic.c | 2 fs/proc/proc_sysctl.c | 2 fs/ramfs/file-nommu.c | 2 fs/reiserfs/inode.c | 2 fs/reiserfs/xattr_acl.c | 8 -- fs/sysv/file.c | 2 fs/ubifs/file.c | 2 fs/udf/file.c | 2 fs/ufs/truncate.c | 2 fs/utimes.c | 4 - fs/xfs/xfs_acl.c | 13 +-- fs/xfs/xfs_file.c | 2 fs/xfs/xfs_inode.c | 2 fs/xfs/xfs_ioctl.c | 2 fs/xfs/xfs_iops.c | 94 +++++++++++++++-------- fs/xfs/xfs_iops.h | 3 - include/linux/can/dev.h | 3 - include/linux/fs.h | 2 include/linux/mount.h | 2 include/linux/netdevice.h | 24 ++++++ include/linux/posix_acl.h | 1 include/net/tcp.h | 2 kernel/cpuset.c | 17 +++- kernel/ptrace.c | 33 +++++++- kernel/sysctl.c | 9 ++ mm/ksm.c | 3 - mm/shmem.c | 2 net/bluetooth/rfcomm/sock.c | 20 +++-- net/core/dev.c | 1 net/ethernet/eth.c | 2 net/ipv4/af_inet.c | 2 net/ipv4/fou.c | 4 - net/ipv4/gre_offload.c | 2 net/ipv4/ping.c | 4 + net/ipv4/udp_offload.c | 9 ++ net/ipv6/ip6_offload.c | 2 net/packet/af_packet.c | 18 +++- net/tipc/bearer.c | 11 ++- net/tipc/bearer.h | 13 +++ net/tipc/udp_media.c | 5 + scripts/gcc-x86_64-has-stack-protector.sh | 2 115 files changed, 604 insertions(+), 308 deletions(-)