Merge tag 'v3.2.95' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.2-stable
[email protected] Thu, 21 Dec 2017 18:10:11 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990491AbdLURKNr0foE/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:43:35 2017 +0100 Commit: 8ce6d2af5b6b6df732df2b79abad86afc53b10e7 Gitweb: https://git.linux-mips.org/g/ralf/linux/8ce6d2af5b6b Branch: linux-3.2-stable --- Makefile | 2 arch/alpha/include/asm/types.h | 14 ++ arch/arm/kernel/return_address.c | 4 - arch/arm/mach-pxa/Kconfig | 1 arch/x86/kernel/acpi/boot.c | 8 + arch/xtensa/kernel/pci-dma.c | 4 + arch/xtensa/kernel/xtensa_ksyms.c | 7 + arch/xtensa/mm/cache.c | 12 +- drivers/acpi/acpica/nsrepair.c | 2 drivers/ata/libata-scsi.c | 6 + drivers/block/DAC960.c | 18 +-- drivers/block/drbd/drbd_main.c | 9 + drivers/edac/i7300_edac.c | 1 drivers/gpio/gpio-tegra.c | 6 - drivers/gpu/drm/i915/i915_drv.c | 7 - drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/gpu/drm/i915/intel_display.c | 8 + drivers/hid/usbhid/hid-core.c | 12 ++ drivers/hwmon/w83781d.c | 6 - drivers/idle/intel_idle.c | 2 drivers/infiniband/core/cma.c | 2 drivers/infiniband/core/uverbs_cmd.c | 5 - drivers/infiniband/core/uverbs_main.c | 3 drivers/infiniband/hw/cxgb3/iwch_provider.c | 5 - drivers/infiniband/hw/cxgb4/cq.c | 1 drivers/infiniband/hw/mlx4/qp.c | 2 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 drivers/input/mouse/trackpoint.c | 3 drivers/input/mouse/trackpoint.h | 3 drivers/isdn/gigaset/capi.c | 2 drivers/isdn/hardware/eicon/capi20.h | 60 ++++----- drivers/isdn/hardware/mISDN/hfcpci.c | 4 - drivers/md/dm.c | 10 - drivers/media/common/tuners/tda18212.c | 2 drivers/media/common/tuners/tda18218.c | 2 drivers/media/common/tuners/xc4000.c | 2 drivers/media/dvb/dvb-usb/mxl111sf.c | 1 drivers/media/rc/redrat3.c | 52 +++----- drivers/misc/vmw_balloon.c | 14 +- drivers/mtd/devices/sst25l.c | 2 drivers/net/ethernet/amd/nmclan_cs.c | 4 - drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 15 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 4 + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 drivers/net/ethernet/mellanox/mlx4/main.c | 2 drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 2 drivers/net/ethernet/realtek/r8169.c | 1 drivers/net/ethernet/sfc/mcdi_mac.c | 25 +--- drivers/net/wireless/ray_cs.c | 4 - drivers/net/wireless/rayctl.h | 4 - drivers/net/wireless/wl1251/main.c | 1 drivers/parisc/dino.c | 2 drivers/platform/x86/samsung-laptop.c | 2 drivers/rtc/rtc-m41t80.c | 157 +---------------------- drivers/scsi/advansys.c | 3 drivers/scsi/aic94xx/aic94xx_sds.c | 5 - drivers/scsi/libsas/sas_scsi_host.c | 61 +++++---- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 7 + drivers/staging/bcm/Kconfig | 1 drivers/staging/comedi/drivers/vmk80xx.c | 2 drivers/staging/cxt1e1/functions.c | 9 - drivers/staging/cxt1e1/pmcc4.h | 1 drivers/staging/iio/accel/lis3l02dq_core.c | 2 drivers/staging/iio/adc/ad7298_ring.c | 2 drivers/staging/iio/gyro/adis16080_core.c | 2 drivers/staging/iio/light/tsl2563.c | 2 drivers/staging/iio/resolver/ad2s1210.c | 2 drivers/staging/slicoss/slicoss.c | 2 drivers/staging/vt6655/device_main.c | 8 + drivers/staging/wlan-ng/prism2fw.c | 157 +++++++++++++---------- drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/config.c | 20 ++- drivers/usb/core/hcd.c | 2 drivers/usb/misc/usbtest.c | 5 - drivers/usb/renesas_usbhs/common.c | 10 + drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/mct_u232.c | 2 drivers/usb/storage/isd200.c | 5 + fs/bio.c | 8 + fs/cifs/cifssmb.c | 24 ++-- fs/cifs/dir.c | 8 + fs/ecryptfs/keystore.c | 2 fs/eventpoll.c | 38 ++++-- fs/fuse/cuse.c | 2 fs/fuse/file.c | 2 fs/nfs/client.c | 1 fs/nilfs2/btree.c | 2 fs/nilfs2/recovery.c | 4 - fs/nilfs2/super.c | 5 + fs/ocfs2/acl.c | 24 ++-- fs/xfs/xfs_ialloc.c | 2 include/asm-generic/topology.h | 6 + include/linux/device-mapper.h | 70 +++------- include/linux/mlx4/device.h | 1 include/linux/mtd/map.h | 2 include/linux/perf_event.h | 6 - include/linux/usb/ch9.h | 1 include/net/ip6_fib.h | 35 +++++ include/net/ip6_route.h | 2 include/net/sctp/sctp.h | 4 + include/scsi/libsas.h | 5 + kernel/audit_watch.c | 12 +- kernel/events/core.c | 103 ++++++++++----- mm/huge_memory.c | 1 mm/mempolicy.c | 5 - mm/page_alloc.c | 20 +++ net/dccp/probe.c | 14 ++ net/ipv4/fib_frontend.c | 9 + net/ipv6/addrconf.c | 2 net/ipv6/ip6_fib.c | 30 +++- net/ipv6/ip6_output.c | 6 - net/ipv6/ip6_tunnel.c | 2 net/ipv6/route.c | 14 ++ net/ipv6/xfrm6_policy.c | 6 - net/key/af_key.c | 48 ++++--- net/l2tp/l2tp_core.c | 65 ++++------ net/l2tp/l2tp_core.h | 19 ++- net/l2tp/l2tp_netlink.c | 72 ++++++----- net/mac80211/key.c | 20 ++- net/netfilter/ipvs/ip_vs_xmit.c | 2 net/netfilter/xt_socket.c | 12 +- net/packet/af_packet.c | 104 ++++++++++----- net/sched/sch_api.c | 2 net/sched/sch_cbq.c | 10 + net/sched/sch_drr.c | 2 net/sched/sch_hfsc.c | 4 - net/sched/sch_htb.c | 5 - net/sched/sch_mq.c | 10 - net/sched/sch_mqprio.c | 19 +-- net/sched/sch_multiq.c | 9 - net/sched/sch_netem.c | 4 - net/sched/sch_qfq.c | 2 net/sched/sch_tbf.c | 5 - net/xfrm/xfrm_user.c | 2 security/keys/key.c | 10 + sound/core/control.c | 2 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/pci/hda/patch_conexant.c | 1 sound/soc/codecs/adau1373.c | 5 + sound/soc/codecs/wm8983.c | 41 +++--- sound/soc/codecs/wm8985.c | 43 +++--- sound/soc/codecs/wm_hubs.c | 2 sound/usb/caiaq/device.c | 2 sound/usb/card.c | 20 +++ sound/usb/mixer.c | 14 ++ sound/usb/mixer.h | 3 sound/usb/mixer_quirks.c | 6 + 151 files changed, 1028 insertions(+), 893 deletions(-)