Merge tag 'v4.13.13' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.13-stable

Author: Ralf Baechle <[email protected]> Thu Dec 21 14:09:26 2017 +0100
Commit: 91897a77943a1d065f3c7f125dea329d770be22b
Gitweb: https://git.linux-mips.org/g/ralf/linux/91897a77943a
Branch: linux-4.13-stable

---

 Makefile                                           |    2 
 arch/arm/kernel/traps.c                            |   28 +++-
 arch/mips/ar7/platform.c                           |    5 +
 arch/mips/ar7/prom.c                               |    2 
 arch/mips/include/asm/mips-cm.h                    |    4 -
 arch/mips/kernel/smp-bmips.c                       |    4 -
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |   10 ++
 arch/powerpc/kvm/book3s_hv.c                       |   29 +++-
 arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S   |   12 +-
 .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S    |   12 +-
 arch/x86/kernel/cpu/Makefile                       |    2 
 arch/x86/kernel/cpu/aperfmperf.c                   |   11 +-
 arch/x86/kernel/cpu/proc.c                         |    4 -
 arch/x86/kernel/smpboot.c                          |   11 +-
 arch/x86/kernel/traps.c                            |   10 +-
 arch/x86/kernel/tsc.c                              |    8 -
 arch/x86/oprofile/op_model_ppro.c                  |    4 -
 crypto/ccm.c                                       |    4 -
 drivers/acpi/acpica/evgpeblk.c                     |   30 +++--
 drivers/acpi/acpica/evxfgpe.c                      |    8 +
 drivers/acpi/scan.c                                |    6 -
 drivers/acpi/sleep.c                               |   28 ++++
 drivers/block/rbd.c                                |    4 -
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    2 
 drivers/input/mouse/elan_i2c_core.c                |    1 
 drivers/net/can/c_can/c_can_pci.c                  |    1 
 drivers/net/can/c_can/c_can_platform.c             |    1 
 drivers/net/can/ifi_canfd/ifi_canfd.c              |    6 -
 drivers/net/can/peak_canfd/peak_pciefd_main.c      |   14 ++
 drivers/net/can/sun4i_can.c                        |   12 ++
 include/acpi/actypes.h                             |    3 
 include/net/netfilter/nf_conntrack.h               |    3 
 include/net/netfilter/nf_nat.h                     |    1 
 include/sound/seq_kernel.h                         |    3 
 include/sound/timer.h                              |    2 
 kernel/workqueue_internal.h                        |    3 
 lib/asn1_decoder.c                                 |    4 -
 net/netfilter/nf_nat_core.c                        |  130 ++++++++------------
 net/netfilter/nft_set_hash.c                       |    1 
 sound/core/hrtimer.c                               |    1 
 sound/core/seq/oss/seq_oss_midi.c                  |    4 -
 sound/core/seq/oss/seq_oss_readq.c                 |   29 ++++
 sound/core/seq/oss/seq_oss_readq.h                 |    2 
 sound/core/timer.c                                 |   67 ++++++++--
 sound/pci/hda/patch_realtek.c                      |    5 +
 sound/usb/quirks.c                                 |    1 
 46 files changed, 342 insertions(+), 192 deletions(-)