Merge tag 'v4.1.46' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
[email protected] Thu, 21 Dec 2017 17:38:46 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992078AbdLUQisfk6hE/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:22:24 2017 +0100 Commit: 468e36258e6e179ce366ec88f8b05270ee1b5d54 Gitweb: https://git.linux-mips.org/g/ralf/linux/468e36258e6e Branch: linux-4.1-stable --- .../bindings/display/bridge/ti,ths8135.txt | 46 +++++ .../devicetree/bindings/iio/adc/avia-hx711.txt | 18 ++ .../devicetree/bindings/vendor-prefixes.txt | 1 Makefile | 2 arch/arm/Kconfig-nommu | 3 arch/arm64/kernel/head.S | 1 arch/mips/kernel/vmlinux.lds.S | 2 arch/parisc/kernel/perf.c | 94 +++++----- arch/parisc/kernel/syscall.S | 55 +++--- arch/powerpc/kvm/book3s_64_vio.c | 46 +++-- arch/powerpc/platforms/pseries/mobility.c | 4 arch/sparc/include/asm/setup.h | 5 - arch/sparc/kernel/smp_64.c | 6 + arch/x86/include/asm/alternative-asm.h | 4 arch/x86/include/asm/alternative.h | 6 - arch/x86/kernel/cpu/microcode/intel.c | 18 ++ arch/x86/kvm/vmx.c | 7 + block/bio.c | 8 + block/bsg-lib.c | 1 block/partitions/efi.c | 17 +- crypto/Kconfig | 1 crypto/shash.c | 8 + drivers/ata/libata-transport.c | 9 - drivers/base/platform.c | 3 drivers/bus/mvebu-mbus.c | 2 drivers/crypto/talitos.c | 4 drivers/gpu/drm/drm_dp_mst_topology.c | 2 drivers/gpu/drm/i915/intel_bios.c | 7 + drivers/hid/i2c-hid/i2c-hid.c | 3 drivers/hid/usbhid/hid-core.c | 12 + drivers/hwmon/gl520sm.c | 25 ++- drivers/i2c/busses/i2c-at91.c | 3 drivers/i2c/busses/i2c-ismt.c | 5 - drivers/i2c/busses/i2c-meson.c | 2 drivers/iio/adc/ad_sigma_delta.c | 28 +++ drivers/iio/adc/axp288_adc.c | 32 --- drivers/iio/adc/mcp320x.c | 1 drivers/iio/adc/xilinx-xadc-core.c | 6 - drivers/iio/industrialio-core.c | 4 drivers/infiniband/hw/qib/qib_iba7322.c | 2 drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 - drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 10 + drivers/input/tablet/gtco.c | 17 +- drivers/iommu/amd_iommu.c | 1 drivers/irqchip/irq-crossbar.c | 3 drivers/isdn/i4l/isdn_ppp.c | 37 +++- drivers/md/raid10.c | 19 ++ drivers/md/raid5.c | 13 + drivers/media/pci/ttpci/av7110_hw.c | 8 - drivers/media/pci/ttpci/av7110_hw.h | 12 + drivers/media/platform/exynos-gsc/gsc-core.c | 2 drivers/mmc/core/sdio_bus.c | 12 + drivers/net/can/usb/esd_usb2.c | 2 drivers/net/can/usb/gs_usb.c | 10 - drivers/net/can/usb/kvaser_usb.c | 9 + drivers/net/ethernet/ibm/emac/mal.c | 3 drivers/net/ethernet/mellanox/mlx4/en_clock.c | 18 +- drivers/net/ethernet/mellanox/mlx4/main.c | 2 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 drivers/net/ethernet/renesas/sh_eth.h | 2 drivers/net/team/team.c | 8 + drivers/net/tun.c | 8 + drivers/net/usb/Kconfig | 2 drivers/net/usb/plusb.c | 15 +- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 37 ++-- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 5 + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 197 ++++++++++---------- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 10 + drivers/net/wireless/mac80211_hwsim.c | 28 ++- drivers/pci/pci-sysfs.c | 11 + drivers/s390/scsi/zfcp_scsi.c | 4 drivers/scsi/device_handler/scsi_dh_emc.c | 2 drivers/scsi/scsi_transport_iscsi.c | 2 drivers/scsi/sg.c | 2 drivers/staging/iio/adc/ad7192.c | 4 drivers/target/iscsi/iscsi_target_erl0.c | 6 - drivers/tty/goldfish.c | 2 drivers/tty/serial/sunhv.c | 6 + drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/config.c | 22 ++ drivers/usb/core/hub.c | 13 + drivers/usb/core/quirks.c | 4 drivers/usb/gadget/composite.c | 5 + drivers/usb/gadget/function/f_mass_storage.c | 27 +-- drivers/usb/gadget/function/f_mass_storage.h | 14 - drivers/usb/gadget/legacy/inode.c | 49 ++++- drivers/usb/gadget/legacy/mass_storage.c | 20 -- drivers/usb/gadget/udc/dummy_hcd.c | 65 ++++++- drivers/usb/host/pci-quirks.c | 8 - drivers/usb/host/xhci-hub.c | 22 ++ drivers/usb/host/xhci.h | 2 drivers/usb/musb/musb_core.c | 6 - drivers/usb/renesas_usbhs/fifo.c | 23 ++ drivers/usb/serial/console.c | 1 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/metro-usb.c | 1 drivers/usb/serial/mos7720.c | 9 + drivers/usb/serial/mos7840.c | 19 ++ drivers/usb/serial/option.c | 2 drivers/usb/serial/qcserial.c | 4 drivers/usb/storage/uas-detect.h | 15 +- drivers/usb/storage/uas.c | 10 + drivers/usb/storage/unusual_devs.h | 7 + drivers/uwb/hwa-rc.c | 2 drivers/uwb/uwbd.c | 12 + drivers/video/fbdev/aty/atyfb_base.c | 2 drivers/watchdog/kempld_wdt.c | 9 + drivers/xen/gntdev.c | 2 fs/btrfs/ioctl.c | 4 fs/btrfs/send.c | 5 - fs/ceph/caps.c | 5 - fs/ceph/mds_client.c | 9 + fs/cifs/connect.c | 8 + fs/cifs/file.c | 7 + fs/cifs/smb2pdu.c | 17 +- fs/direct-io.c | 3 fs/ext4/acl.c | 22 ++ fs/ext4/inode.c | 24 ++ fs/f2fs/data.c | 7 + fs/fuse/dir.c | 3 fs/ocfs2/dlmglue.c | 105 ++++++++++- fs/ocfs2/dlmglue.h | 18 ++ fs/ocfs2/ocfs2.h | 1 fs/read_write.c | 4 fs/xattr.c | 2 fs/xfs/kmem.c | 18 -- fs/xfs/kmem.h | 2 fs/xfs/xfs_itable.c | 6 - include/asm-generic/percpu.h | 24 ++ include/linux/audit.h | 20 ++ include/linux/cpuset.h | 6 + include/linux/iio/adc/ad_sigma_delta.h | 3 include/linux/key.h | 2 include/linux/mbus.h | 4 include/linux/mmc/sdio_func.h | 2 include/linux/platform_data/mmp_dma.h | 1 include/net/sctp/ulpevent.h | 6 + include/sound/seq_virmidi.h | 1 include/uapi/drm/drm_fourcc.h | 1 include/uapi/linux/mroute6.h | 1 include/uapi/linux/rds.h | 3 include/uapi/linux/spi/spidev.h | 1 include/uapi/linux/usb/ch9.h | 1 kernel/bpf/verifier.c | 3 kernel/cpuset.c | 16 ++ kernel/locking/lockdep.c | 11 + kernel/power/process.c | 5 - kernel/sched/core.c | 7 - kernel/trace/ftrace.c | 14 - kernel/trace/trace.c | 12 + kernel/workqueue.c | 37 ++-- lib/assoc_array.c | 51 ++--- lib/digsig.c | 6 + mm/slab_common.c | 5 - net/compat.c | 17 +- net/core/dev.c | 3 net/core/sock.c | 2 net/ipv4/ip_vti.c | 3 net/ipv4/netfilter/nf_nat_snmp_basic.c | 1 net/ipv6/ip6_vti.c | 3 net/ipv6/udp.c | 1 net/l2tp/l2tp_core.c | 14 + net/l2tp/l2tp_core.h | 5 - net/mac80211/offchannel.c | 2 net/netfilter/nf_conntrack_ecache.c | 2 net/netfilter/nf_conntrack_expect.c | 4 net/netfilter/nf_conntrack_netlink.c | 1 net/netfilter/nf_nat_core.c | 2 net/netfilter/nfnetlink_cthelper.c | 20 +- net/netfilter/nfnetlink_cttimeout.c | 1 net/packet/af_packet.c | 10 + net/rds/ib_cm.c | 47 ++++- net/rds/ib_send.c | 25 ++- net/rds/rdma.c | 10 + net/rds/rds.h | 1 net/rds/send.c | 4 net/tipc/msg.c | 2 net/wireless/nl80211.c | 3 security/keys/internal.h | 2 security/keys/key.c | 12 + security/keys/keyctl.c | 5 + security/keys/keyring.c | 37 ++-- security/keys/process_keys.c | 8 + security/smack/smack_lsm.c | 55 +++--- sound/core/compress_offload.c | 3 sound/core/seq/seq_clientmgr.c | 6 + sound/core/seq/seq_lock.c | 4 sound/core/seq/seq_lock.h | 12 - sound/core/seq/seq_ports.c | 7 + sound/core/seq/seq_virmidi.c | 27 ++- sound/pci/au88x0/au88x0_core.c | 3 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/patch_realtek.c | 8 + sound/usb/caiaq/device.c | 12 + sound/usb/card.c | 20 ++ sound/usb/line6/driver.c | 7 - sound/usb/mixer.c | 12 + sound/usb/mixer.h | 2 sound/usb/quirks.c | 1 sound/usb/usx2y/usb_stream.c | 6 - tools/include/linux/compiler.h | 8 + tools/perf/scripts/perl/Perf-Trace-Util/Build | 4 202 files changed, 1575 insertions(+), 804 deletions(-)