Merge tag 'v4.14.50' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.14-stable
[email protected] Mon, 18 Jun 2018 09:28:15 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994551AbeFRH2R62uAU/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jun 18 08:56:58 2018 +0200 Commit: 0f210bc1d8f9a8a2ed9c3e4dfabfa75a3bc27610 Gitweb: https://git.linux-mips.org/g/ralf/linux/0f210bc1d8f9 Branch: linux-4.14-stable --- Makefile | 2 arch/x86/include/asm/kvm_emulate.h | 6 + arch/x86/kvm/emulate.c | 76 +++++----- arch/x86/kvm/vmx.c | 38 +++-- arch/x86/kvm/x86.c | 53 +++++-- arch/x86/kvm/x86.h | 4 - block/blk-zoned.c | 8 + drivers/crypto/caam/caamalg.c | 231 ++++++++++++++----------------- drivers/crypto/caam/caamalg_qi.c | 227 ++++++++++++++++-------------- drivers/crypto/caam/caampkc.c | 62 ++++++++ drivers/crypto/caam/caampkc.h | 8 + drivers/crypto/cavium/zip/common.h | 21 +++ drivers/crypto/cavium/zip/zip_crypto.c | 22 ++- drivers/crypto/cavium/zip/zip_deflate.c | 4 - drivers/crypto/cavium/zip/zip_inflate.c | 4 - drivers/crypto/omap-sham.c | 2 drivers/crypto/vmx/aes.c | 2 drivers/crypto/vmx/aes_cbc.c | 3 drivers/crypto/vmx/aes_ctr.c | 2 drivers/crypto/vmx/aes_xts.c | 2 drivers/crypto/vmx/ghash.c | 2 drivers/gpio/gpiolib.c | 9 + drivers/input/joystick/xpad.c | 2 drivers/input/mouse/elan_i2c_core.c | 1 drivers/input/touchscreen/goodix.c | 1 drivers/misc/vmw_balloon.c | 23 +-- drivers/nfc/pn533/usb.c | 42 ++++-- drivers/phy/qualcomm/phy-qcom-qusb2.c | 4 + drivers/staging/android/ion/ion.c | 5 + drivers/tty/serial/8250/8250_omap.c | 16 ++ drivers/tty/serial/amba-pl011.c | 16 ++ drivers/tty/serial/atmel_serial.c | 5 - drivers/tty/serial/samsung.c | 7 - drivers/tty/serial/sh-sci.c | 4 - drivers/usb/gadget/function/f_printer.c | 6 - drivers/usb/gadget/udc/renesas_usb3.c | 7 + drivers/usb/storage/uas.c | 6 + drivers/usb/storage/unusual_devs.h | 9 + drivers/usb/storage/unusual_uas.h | 9 + drivers/usb/usbip/vhci_sysfs.c | 24 ++- net/key/af_key.c | 45 +++++- net/netfilter/nft_ct.c | 20 ++- 42 files changed, 628 insertions(+), 412 deletions(-)