Merge tag 'v3.18.52' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993411AbdFFRRRtu7Iq/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jun 6 16:07:00 2017 +0200 Commit: 6dd3bb13a58cf9c3974c9069773aa7b26aef7b4b Gitweb: https://git.linux-mips.org/g/ralf/linux/6dd3bb13a58c Branch: linux-3.18-stable --- Makefile | 2 arch/arm/mach-cns3xxx/Makefile | 1 arch/arm64/include/asm/cpufeature.h | 10 +- arch/arm64/kernel/setup.c | 2 arch/arm64/kernel/vdso/Makefile | 3 + arch/mips/boot/elf2ecoff.c | 7 ++ arch/mips/jz4740/irq.h | 2 arch/powerpc/kernel/ptrace.c | 4 - arch/sparc/include/asm/pgtable_64.h | 15 ++- arch/sparc/mm/init_64.c | 2 arch/x86/kernel/ftrace.c | 12 +++ arch/x86/xen/time.c | 6 + drivers/block/drbd/drbd_bitmap.c | 6 + drivers/infiniband/hw/ehca/ehca_mrmw.c | 3 - drivers/infiniband/hw/mlx5/mem.c | 2 drivers/infiniband/hw/qib/qib_qp.c | 18 ++-- drivers/infiniband/ulp/iser/iser_memory.c | 1 drivers/infiniband/ulp/iser/iser_verbs.c | 15 ++- drivers/input/serio/i8042-x86ia64io.h | 7 ++ drivers/isdn/hardware/mISDN/mISDNipac.c | 12 ++- drivers/isdn/hardware/mISDN/w6692.c | 6 + drivers/md/dm-ioctl.c | 2 drivers/md/raid1.c | 2 drivers/media/tuners/tuner-xc2028.c | 7 +- drivers/message/i2o/i2o_config.c | 4 - drivers/mtd/chips/Kconfig | 1 drivers/net/ethernet/broadcom/tg3.c | 2 drivers/net/ethernet/intel/e1000e/ich8lan.c | 13 ++- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 10 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 6 + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 + drivers/net/phy/phy.c | 2 drivers/pci/host/pcie-xilinx.c | 4 - drivers/regulator/core.c | 2 drivers/scsi/advansys.c | 3 - drivers/scsi/ips.c | 9 +- drivers/staging/bcm/Kconfig | 1 drivers/staging/imx-drm/imx-hdmi.c | 2 drivers/staging/unisys/visorutil/periodic_work.c | 8 +- drivers/staging/vt6655/device_main.c | 10 +- drivers/tty/isicom.c | 2 drivers/usb/gadget/function/f_midi.c | 4 + fs/9p/acl.c | 40 ++++----- fs/btrfs/acl.c | 6 - fs/ceph/acl.c | 6 - fs/cifs/cifsglob.h | 11 ++ fs/cifs/cifssmb.c | 4 + fs/cifs/connect.c | 13 ++- fs/cifs/smb2misc.c | 44 +++++++++ fs/cifs/smb2ops.c | 4 + fs/cifs/smb2proto.h | 7 ++ fs/cifs/smb2transport.c | 58 +++++++++++- fs/cifs/transport.c | 2 fs/ext2/acl.c | 12 +-- fs/ext4/acl.c | 12 +-- fs/ext4/xattr.c | 32 ++++++- fs/f2fs/acl.c | 6 - fs/f2fs/super.c | 98 +++++++++++++++++++++ fs/gfs2/acl.c | 12 +-- fs/gfs2/dir.c | 15 ++- fs/hfsplus/posix_acl.c | 4 - fs/jffs2/acl.c | 9 +- fs/jfs/acl.c | 6 - fs/nfsd/nfssvc.c | 36 ++++++++ fs/ocfs2/acl.c | 20 ++-- fs/posix_acl.c | 31 +++++++ fs/reiserfs/xattr_acl.c | 8 -- fs/timerfd.c | 17 +++- fs/xfs/xfs_acl.c | 13 +-- include/linux/capability.h | 2 include/linux/cpumask.h | 6 - include/linux/cred.h | 5 + include/linux/mtd/map.h | 19 ++-- include/linux/perf_event.h | 6 - include/linux/posix_acl.h | 1 kernel/events/core.c | 15 +++ lib/cpumask.c | 74 ++++++---------- mm/cma.c | 7 +- mm/memory.c | 13 ++- net/9p/client.c | 4 + net/core/neighbour.c | 3 - net/core/netpoll.c | 10 ++ net/core/sock.c | 4 - net/ipv6/ip6mr.c | 13 +-- net/l2tp/l2tp_ip.c | 5 + net/l2tp/l2tp_ip6.c | 5 + net/l2tp/l2tp_ppp.c | 7 +- net/packet/af_packet.c | 4 + net/rds/cong.c | 4 - net/sctp/socket.c | 3 + scripts/kconfig/Makefile | 2 scripts/mod/modpost.c | 34 +++++++ sound/core/pcm_lib.c | 2 sound/core/seq/seq_lock.c | 9 +- sound/ppc/awacs.c | 1 95 files changed, 698 insertions(+), 322 deletions(-)