Merge tag 'v3.18.46' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993059AbdABKggJyXcw/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jan 2 11:24:04 2017 +0100 Commit: e33a92285d2fa63a141697cc616f8f12a7247cbc Gitweb: https://git.linux-mips.org/g/ralf/linux/e33a92285d2f Branch: linux-3.18-stable --- Documentation/arm/CCN.txt | 2 + Makefile | 2 + arch/arm/include/asm/dma-mapping.h | 2 + arch/x86/include/asm/tlbflush.h | 2 + arch/x86/purgatory/Makefile | 1 + drivers/bus/arm-ccn.c | 36 ++++++++++++++++++-- drivers/gpu/drm/msm/msm_gem_submit.c | 27 ++++++++++++--- drivers/mtd/nand/davinci_nand.c | 3 ++ drivers/net/can/dev.c | 27 +++++++++------ drivers/scsi/arcmsr/arcmsr_hba.c | 8 ++++ drivers/scsi/megaraid/megaraid_sas.h | 2 + fs/fuse/dir.c | 7 ++-- fs/fuse/file.c | 2 + fs/fuse/fuse_i.h | 2 + fs/nfsd/nfsproc.c | 52 ++++++++++++++++++++++++++++- fs/nfsd/vfs.c | 36 -------------------- include/linux/can/dev.h | 3 +- include/net/tcp.h | 2 + kernel/cpuset.c | 17 ++++++++- mm/ksm.c | 3 +- net/bluetooth/rfcomm/sock.c | 20 +++++++---- net/packet/af_packet.c | 18 +++++++--- scripts/gcc-x86_64-has-stack-protector.sh | 2 + 23 files changed, 189 insertions(+), 87 deletions(-)