Merge tag 'v3.12.70' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.12-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993966AbdBFOJ1wJtmj/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Feb 6 14:26:06 2017 +0100 Commit: d3f447a7c9eae878b76ce6ac3b7361061ad60b4c Gitweb: https://git.linux-mips.org/g/ralf/linux/d3f447a7c9ea Branch: linux-3.12-stable --- .../devicetree/bindings/clock/imx31-clock.txt | 2 Makefile | 2 arch/arm/boot/dts/da850-evm.dts | 1 arch/arm/boot/dts/imx31.dtsi | 18 +-- arch/arm/include/asm/cputype.h | 3 arch/arm/kernel/hw_breakpoint.c | 16 ++ arch/arm/mach-davinci/da850.c | 12 ++ arch/arm/mach-ux500/pm.c | 4 - arch/arm/xen/enlighten.c | 3 arch/arm64/include/uapi/asm/ptrace.h | 1 arch/arm64/kernel/entry.S | 2 arch/arm64/kernel/ptrace.c | 11 +- arch/arm64/kernel/traps.c | 25 +++- arch/cris/boot/rescue/Makefile | 8 + arch/m68k/include/asm/delay.h | 2 arch/powerpc/boot/ps3-head.S | 5 - arch/powerpc/boot/ps3.c | 8 - arch/powerpc/kernel/ibmebus.c | 16 ++ arch/powerpc/kernel/idle_power7.S | 2 arch/powerpc/kernel/misc_32.S | 2 arch/x86/include/asm/apic.h | 3 arch/x86/kernel/cpu/common.c | 2 arch/x86/kernel/cpu/perf_event.c | 2 arch/x86/kernel/cpu/perf_event_intel.c | 2 arch/x86/kernel/entry_32.S | 4 - arch/x86/kernel/entry_64.S | 3 arch/x86/kernel/smp.c | 2 arch/x86/kvm/emulate.c | 66 ++++++++-- arch/x86/kvm/lapic.c | 6 + arch/x86/kvm/lapic.h | 1 arch/x86/kvm/vmx.c | 11 +- arch/x86/kvm/x86.c | 1 arch/x86/pci/acpi.c | 10 + block/bsg.c | 3 drivers/base/core.c | 42 ++++-- drivers/clk/clk-wm831x.c | 2 drivers/clocksource/exynos_mct.c | 17 +-- drivers/crypto/caam/caamalg.c | 4 - drivers/gpu/drm/ast/ast_main.c | 7 + drivers/gpu/drm/gma500/psb_drv.c | 3 drivers/gpu/drm/radeon/si_dpm.c | 14 -- drivers/hid/hid-cypress.c | 3 drivers/hwmon/ds620.c | 2 drivers/hwmon/g762.c | 11 +- drivers/i2c/i2c-dev.c | 2 drivers/infiniband/core/mad.c | 2 drivers/infiniband/core/multicast.c | 7 + drivers/infiniband/hw/mlx4/ah.c | 6 + drivers/infiniband/hw/mlx4/main.c | 8 + drivers/input/joystick/xpad.c | 6 + drivers/input/serio/i8042-x86ia64io.h | 6 + drivers/iommu/amd_iommu.c | 2 drivers/isdn/gigaset/ser-gigaset.c | 4 - drivers/md/dm-crypt.c | 7 + drivers/md/md.c | 2 drivers/md/persistent-data/dm-space-map-metadata.c | 10 + drivers/md/raid5.c | 9 + drivers/media/rc/ite-cir.c | 2 drivers/media/tuners/tuner-xc2028.c | 34 +++-- drivers/mmc/card/mmc_test.c | 2 drivers/mmc/host/mxs-mmc.c | 6 + drivers/mtd/nand/Kconfig | 2 drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 8 + drivers/net/ethernet/brocade/bna/bnad.c | 4 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 ++- drivers/net/ethernet/ti/cpmac.c | 5 - drivers/net/hyperv/netvsc_drv.c | 4 + drivers/net/vmxnet3/vmxnet3_drv.c | 2 drivers/pci/hotplug/rpadlpar_core.c | 10 + drivers/pci/pci.c | 4 + drivers/pinctrl/sh-pfc/pinctrl.c | 3 drivers/s390/char/vmlogrdr.c | 2 drivers/s390/scsi/zfcp_dbf.c | 17 ++- drivers/s390/scsi/zfcp_dbf.h | 41 ++++++ drivers/s390/scsi/zfcp_erp.c | 61 +++++++++ drivers/s390/scsi/zfcp_ext.h | 4 - drivers/s390/scsi/zfcp_fsf.h | 3 drivers/s390/scsi/zfcp_reqlist.h | 30 ++++ drivers/s390/scsi/zfcp_scsi.c | 61 ++++++++- drivers/scsi/mvsas/mv_94xx.c | 2 drivers/scsi/qla2xxx/qla_os.c | 16 ++ drivers/scsi/scsi_sysfs.c | 4 - drivers/scsi/sg.c | 11 +- drivers/ssb/pci.c | 1 drivers/staging/iio/adc/ad7606_core.c | 2 drivers/target/iscsi/iscsi_target_tpg.c | 1 drivers/thermal/thermal_hwmon.c | 2 drivers/tty/serial/8250/8250_pci.c | 23 +++ drivers/tty/sysrq.c | 4 - drivers/usb/class/cdc-acm.c | 1 drivers/usb/core/config.c | 10 + drivers/usb/core/hub.c | 136 ++++++++------------ drivers/usb/dwc3/dwc3-pci.c | 16 ++ drivers/usb/dwc3/gadget.c | 8 + drivers/usb/gadget/composite.c | 23 ++- drivers/usb/gadget/dummy_hcd.c | 6 - drivers/usb/gadget/inode.c | 17 ++- drivers/usb/gadget/uvc_video.c | 2 drivers/usb/host/uhci-pci.c | 4 + drivers/usb/host/xhci-hub.c | 37 +++++ drivers/usb/host/xhci-mem.c | 42 ++++++ drivers/usb/host/xhci-pci.c | 13 ++ drivers/usb/host/xhci-ring.c | 7 - drivers/usb/host/xhci.c | 13 -- drivers/usb/host/xhci.h | 3 drivers/usb/musb/musbhsdma.h | 2 drivers/usb/phy/phy-am335x-control.c | 2 drivers/usb/serial/ch341.c | 90 ++++++++----- drivers/usb/serial/cyberjack.c | 10 + drivers/usb/serial/garmin_gps.c | 1 drivers/usb/serial/io_edgeport.c | 5 + drivers/usb/serial/io_ti.c | 17 ++- drivers/usb/serial/iuu_phoenix.c | 11 ++ drivers/usb/serial/keyspan_pda.c | 14 ++ drivers/usb/serial/kl5kusb105.c | 44 +++++- drivers/usb/serial/kobil_sct.c | 12 ++ drivers/usb/serial/mos7720.c | 51 +++----- drivers/usb/serial/mos7840.c | 12 ++ drivers/usb/serial/omninet.c | 13 ++ drivers/usb/serial/option.c | 7 + drivers/usb/serial/oti6858.c | 16 ++ drivers/usb/serial/pl2303.c | 8 + drivers/usb/serial/quatech2.c | 4 - drivers/usb/serial/spcp8x5.c | 14 ++ drivers/usb/serial/ti_usb_3410_5052.c | 7 + drivers/vfio/pci/vfio_pci.c | 33 +++-- drivers/vfio/pci/vfio_pci_intrs.c | 2 drivers/vme/bridges/vme_ca91cx42.c | 2 drivers/xen/gntdev.c | 2 fs/9p/acl.c | 40 +++--- fs/block_dev.c | 9 + fs/btrfs/acl.c | 6 - fs/btrfs/delayed-inode.c | 8 - fs/btrfs/extent_io.c | 9 + fs/btrfs/tree-log.c | 3 fs/cifs/cifs_fs_sb.h | 4 + fs/cifs/cifsfs.c | 17 ++- fs/cifs/cifsglob.h | 3 fs/cifs/cifsproto.h | 5 + fs/cifs/connect.c | 116 ++++++++++++++++- fs/cifs/dir.c | 20 +++ fs/cifs/inode.c | 22 +++ fs/cifs/smb2file.c | 2 fs/cifs/smb2pdu.c | 77 ++++++++--- fs/cifs/smb2proto.h | 1 fs/dcache.c | 7 + fs/exec.c | 10 + fs/ext2/acl.c | 12 +- fs/ext3/acl.c | 10 - fs/ext4/acl.c | 12 +- fs/ext4/inline.c | 4 - fs/ext4/inode.c | 29 +++- fs/ext4/mballoc.c | 4 - fs/ext4/super.c | 64 +++++---- fs/f2fs/acl.c | 6 - fs/f2fs/debug.c | 1 fs/fuse/file.c | 5 - fs/generic_acl.c | 12 +- fs/gfs2/acl.c | 14 +- fs/hfsplus/posix_acl.c | 4 - fs/hfsplus/xattr.c | 5 - fs/ioprio.c | 2 fs/jffs2/acl.c | 9 + fs/jfs/xattr.c | 5 - fs/nfs/dir.c | 1 fs/nfs/file.c | 2 fs/nfs/nfs4filelayoutdev.c | 3 fs/ocfs2/acl.c | 20 +-- fs/ocfs2/dlmglue.c | 10 + fs/ocfs2/file.c | 9 + fs/ocfs2/stackglue.c | 6 + fs/ocfs2/stackglue.h | 3 fs/posix_acl.c | 31 +++++ fs/proc/proc_sysctl.c | 3 fs/reiserfs/xattr_acl.c | 8 - fs/ubifs/tnc.c | 25 +++- fs/xfs/xfs_acl.c | 15 +- fs/xfs/xfs_log_recover.c | 1 include/linux/capability.h | 2 include/linux/cpu.h | 12 -- include/linux/cred.h | 5 + include/linux/jump_label_ratelimit.h | 4 + include/linux/netdevice.h | 9 + include/linux/posix_acl.h | 1 include/uapi/linux/can.h | 1 kernel/cpu.c | 3 kernel/jump_label.c | 6 + kernel/rtmutex.c | 68 ++++++++++ kernel/rtmutex_common.h | 5 - kernel/time/tick-broadcast.c | 3 mm/hugetlb.c | 37 ++++- mm/page_alloc.c | 17 +-- mm/vmscan.c | 14 ++ net/can/raw.c | 3 net/ceph/messenger.c | 13 ++ net/core/dev.c | 4 - net/core/drop_monitor.c | 39 ++++-- net/ipv4/igmp.c | 7 + net/ipv6/ip6_offload.c | 1 net/ipv6/raw.c | 7 + net/sched/cls_api.c | 4 - net/sunrpc/auth_gss/svcauth_gss.c | 2 scripts/kconfig/nconf.gui.c | 15 ++ security/apparmor/apparmorfs.c | 2 security/apparmor/audit.c | 3 security/apparmor/domain.c | 22 +-- security/apparmor/file.c | 3 security/apparmor/include/match.h | 1 security/apparmor/include/policy.h | 2 security/apparmor/lsm.c | 22 +-- security/apparmor/match.c | 16 +- security/apparmor/path.c | 61 +++++---- security/apparmor/policy.c | 61 ++++++--- security/apparmor/policy_unpack.c | 5 + sound/pci/hda/patch_conexant.c | 17 +++ sound/pci/hda/patch_realtek.c | 2 sound/usb/card.c | 1 sound/usb/hiface/pcm.c | 2 sound/usb/mixer.c | 3 tools/perf/util/trace-event-scripting.c | 6 + tools/testing/selftests/net/run_netsocktests | 2 222 files changed, 1973 insertions(+), 783 deletions(-)