Merge tag 'v3.18.79' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Thu, 21 Dec 2017 17:43:45 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992170AbdLUQnsQB4UE/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:25:05 2017 +0100 Commit: 907ef60b751e4a23236976d62394db7a338af761 Gitweb: https://git.linux-mips.org/g/ralf/linux/907ef60b751e Branch: linux-3.18-stable --- Makefile | 2 + drivers/input/tablet/gtco.c | 17 +++++++------ drivers/net/can/usb/kvaser_usb.c | 3 +- drivers/s390/scsi/zfcp_aux.c | 5 ++++ drivers/s390/scsi/zfcp_erp.c | 18 ++++++++----- drivers/s390/scsi/zfcp_scsi.c | 5 ++++ drivers/scsi/sg.c | 2 + drivers/usb/host/xhci-hub.c | 22 +++++++++++++--- fs/ceph/caps.c | 5 +++- fs/ecryptfs/ecryptfs_kernel.h | 25 +++++++++++++------ fs/ecryptfs/keystore.c | 9 ++++++- fs/fuse/dir.c | 3 +- include/uapi/linux/spi/spidev.h | 1 + lib/assoc_array.c | 51 +++++++++++++------------------------- 14 files changed, 101 insertions(+), 67 deletions(-)