Merge tag 'v3.18.95' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Sat, 16 Jun 2018 06:21:24 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993081AbeFPEV030TKh/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:07:10 2018 +0200 Commit: 98e1381efb72a94d3b15b70dcfe4f81886c532d6 Gitweb: https://git.linux-mips.org/g/ralf/linux/98e1381efb72 Branch: linux-3.18-stable --- Makefile | 2 arch/alpha/kernel/pci_impl.h | 3 - arch/alpha/kernel/process.c | 3 - arch/arm/configs/exynos_defconfig | 7 + arch/mn10300/mm/misalignment.c | 2 arch/openrisc/kernel/traps.c | 10 +- arch/sh/kernel/traps_32.c | 3 - arch/xtensa/include/asm/futex.h | 23 ++--- crypto/ahash.c | 11 ++ crypto/cryptd.c | 3 - drivers/acpi/sbshc.c | 4 - drivers/block/pktcdvd.c | 4 - drivers/crypto/caam/ctrl.c | 8 +- drivers/edac/octeon_edac-lmc.c | 1 drivers/media/usb/dvb-usb-v2/lmedm04.c | 39 +++++--- drivers/media/usb/dvb-usb/cxusb.c | 2 drivers/media/usb/dvb-usb/dib0700_devices.c | 1 drivers/mtd/nand/nand_base.c | 5 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 18 ++-- drivers/net/ethernet/realtek/r8169.c | 4 - drivers/usb/usbip/stub_dev.c | 3 - drivers/usb/usbip/stub_main.c | 5 + drivers/usb/usbip/stub_rx.c | 53 ++++++++-- drivers/usb/usbip/stub_tx.c | 4 - drivers/usb/usbip/usbip_common.c | 15 +-- drivers/usb/usbip/usbip_common.h | 1 drivers/usb/usbip/usbip_event.c | 5 + drivers/usb/usbip/vhci_hcd.c | 102 +++++++++++--------- drivers/usb/usbip/vhci_rx.c | 53 +++++----- drivers/usb/usbip/vhci_sysfs.c | 45 +++++---- drivers/usb/usbip/vhci_tx.c | 17 ++- drivers/vhost/net.c | 1 fs/cifs/cifsencrypt.c | 3 - fs/cifs/connect.c | 6 + fs/cifs/file.c | 26 ++--- fs/cifs/misc.c | 14 +-- fs/cifs/smb2pdu.c | 3 - fs/kernfs/file.c | 2 fs/nfs/direct.c | 4 - fs/nfs/write.c | 2 include/crypto/internal/hash.h | 2 include/net/arp.h | 6 + kernel/async.c | 20 ++-- kernel/time/posix-timers.c | 34 ++++--- net/dccp/proto.c | 5 + net/ipv4/igmp.c | 4 + net/ipv4/tcp.c | 6 + net/ipv6/ip6mr.c | 1 security/keys/encrypted-keys/encrypted.c | 31 +++--- tools/usb/usbip/libsrc/usbip_common.c | 9 ++ tools/usb/usbip/libsrc/usbip_host_driver.c | 27 ++++- tools/usb/usbip/libsrc/vhci_driver.c | 8 +- 52 files changed, 393 insertions(+), 277 deletions(-)