Merge tag 'v4.11.6' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.11-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994853AbdIVIVD712fV/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Sep 20 23:49:59 2017 +0200 Commit: fde6fd9cae6b9e494247d72c9f68a063e149b0db Gitweb: https://git.linux-mips.org/g/ralf/linux/fde6fd9cae6b Branch: linux-4.11-stable --- Makefile | 2 +- arch/s390/kernel/entry.S | 19 ++++++++++----- arch/x86/platform/efi/efi-bgrt.c | 26 +++++++++++++++++++- arch/xtensa/include/asm/irq.h | 3 ++ arch/xtensa/kernel/irq.c | 5 ---- .../platforms/xtfpga/include/platform/hardware.h | 6 +++-- arch/xtensa/platforms/xtfpga/setup.c | 10 ++++---- block/partitions/msdos.c | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 13 +++++++--- drivers/gpu/drm/i915/i915_gem_gtt.c | 13 ++-------- drivers/gpu/drm/i915/i915_pci.c | 1 - drivers/gpu/drm/i915/intel_display.c | 9 +++++++ drivers/gpu/drm/i915/intel_fbc.c | 19 +++++---------- drivers/gpu/drm/i915/intel_pm.c | 9 +++++++ drivers/gpu/drm/i915/intel_sprite.c | 21 ++++++++++++++++ drivers/irqchip/irq-xtensa-mx.c | 2 +- drivers/irqchip/irq-xtensa-pic.c | 2 +- drivers/pci/pci.c | 3 ++ include/linux/pci.h | 5 ++++ 19 files changed, 118 insertions(+), 52 deletions(-)