Merge tag 'v3.18.69' 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 | <S23994807AbdIVITCeGMuV/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Sep 20 23:39:40 2017 +0200 Commit: 461996928f9f383a6c449db5103a71f588da36c4 Gitweb: https://git.linux-mips.org/g/ralf/linux/461996928f9f Branch: linux-3.18-stable --- Makefile | 2 + arch/arm64/kernel/fpsimd.c | 3 ++ arch/arm64/mm/fault.c | 5 ++- arch/x86/boot/compressed/misc.c | 14 ++++++++ arch/x86/include/asm/io.h | 4 +- arch/x86/tools/relocs.c | 39 +++++++++++++++++------ drivers/base/dma-contiguous.c | 2 + drivers/clk/clk-si5351.c | 10 +++--- drivers/net/wireless/p54/fwio.c | 2 + drivers/scsi/isci/remote_node_context.c | 3 ++ drivers/scsi/sg.c | 49 +++++++++++++++++------------ include/linux/bitmap.h | 36 ++++++++++++++++++--- include/linux/cma.h | 13 ++++---- include/linux/dma-contiguous.h | 4 +- kernel/gcov/base.c | 12 +++++++ kernel/gcov/gcc_4_7.c | 6 +++- lib/bitmap.c | 24 ++++++++------ mm/cma.c | 52 +++++++++++++++++++++++-------- mm/page_alloc.c | 6 ++-- sound/pci/au88x0/au88x0_core.c | 14 +++----- 20 files changed, 208 insertions(+), 92 deletions(-)