Release 4.4.18-openpower1

  - v4.4.18 stable release
  - drop 'scsi: ignore errors from scsi_dh_add_device()' as this is
    included in the upstream stable release
  - drop 'drivers/drm/ast: Update VGA Ownership register value' as
    this was found to not fix the issue it was claimed to have fixed

Signed-off-by: Joel Stanley <joel@jms.id.au>
(cherry picked from commit eeef14f22c0852a91d13e9f6c00df070f7facb8c)
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
diff --git a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
index dde51c0..e82b3e4 100644
--- a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
+++ b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
@@ -1,7 +1,7 @@
-From 575e0185aec226044c9608750eec1b80a4bbac5c Mon Sep 17 00:00:00 2001
+From 8964043403b2b1990f5fa164473b18c4a9b88137 Mon Sep 17 00:00:00 2001
 From: Jeremy Kerr <jk@ozlabs.org>
 Date: Wed, 2 Mar 2016 11:25:47 +0800
-Subject: [PATCH 02/11] drivers/drm/ast: Switch SCU to VGA output on POST
+Subject: [PATCH 2/9] drivers/drm/ast: Switch SCU to VGA output on POST
 
 On AST BMC platforms, the BMC may be using the VGA device for UART
 mirroring. In this case, we need to switch the DAC output to