Merge branch 'kernel-4.4.4' of https://github.com/shenki/op-build
https://github.com/open-power/op-build/pull/376
diff --git a/buildroot b/buildroot
index b7540b2..2179a1c 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit b7540b23bc01d6895c5cba1eaef53deba002087c
+Subproject commit 2179a1c5d3007d51ed4ef70b3c8ea7b89b7e2252
diff --git a/openpower/linux/linux-0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/linux-0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index dba2f12..794c1ec 100644
--- a/openpower/linux/linux-0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/linux-0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,4 +1,4 @@
-From f9f63ceed65d3dae3eddb8ac1b513c41999d881b Mon Sep 17 00:00:00 2001
+From bdc501c682bfd1f79f1238485690ef07ca19b62d Mon Sep 17 00:00:00 2001
From: Thadeu Lima De Souza Cascardo <thadeul@br.ibm.com>
Date: Tue, 25 Mar 2014 10:45:16 -0400
Subject: [PATCH 1/7] xhci: Use xhci_pci_remove for xhci device shutdown
diff --git a/openpower/linux/linux-0002-Revert-usb-xhci-stop-everything-on-the-first-call-to.patch b/openpower/linux/linux-0002-Revert-usb-xhci-stop-everything-on-the-first-call-to.patch
index b1a98a9..c943161 100644
--- a/openpower/linux/linux-0002-Revert-usb-xhci-stop-everything-on-the-first-call-to.patch
+++ b/openpower/linux/linux-0002-Revert-usb-xhci-stop-everything-on-the-first-call-to.patch
@@ -1,4 +1,4 @@
-From 39013a21f92d0d4aa0a9588ba380037af33f3c1a Mon Sep 17 00:00:00 2001
+From 062041d7651b350d58b96186cba34205b888649d Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Thu, 28 Jan 2016 13:07:06 +1030
Subject: [PATCH 2/7] Revert "usb: xhci: stop everything on the first call to
diff --git a/openpower/linux/linux-0003-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/linux-0003-xhci-do-not-halt-the-secondary-HCD.patch
index 3c6657a..58972f0 100644
--- a/openpower/linux/linux-0003-xhci-do-not-halt-the-secondary-HCD.patch
+++ b/openpower/linux/linux-0003-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,4 +1,4 @@
-From ca2c088493b9c02f33934d6c6dfb327b6dac3bd0 Mon Sep 17 00:00:00 2001
+From 714b0ebc3d05aada3a9f05130b288614223eea59 Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Date: Mon, 10 Mar 2014 13:02:13 -0300
Subject: [PATCH 3/7] xhci: do not halt the secondary HCD
diff --git a/openpower/linux/linux-0004-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch b/openpower/linux/linux-0004-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
index 311f35b..38a4cb3 100644
--- a/openpower/linux/linux-0004-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
+++ b/openpower/linux/linux-0004-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
@@ -1,4 +1,4 @@
-From c530d7ca1a5e8645b8a8a9496131ff9b6b896450 Mon Sep 17 00:00:00 2001
+From b3a36e533ebca20877dfaa1c9b6620607905c403 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 2 Mar 2016 11:25:47 +0800
Subject: [PATCH 4/7] drivers/drm/ast: Switch SCU to VGA output on POST
diff --git a/openpower/linux/linux-0005-scsi-ignore-errors-from-scsi_dh_add_device.patch b/openpower/linux/linux-0005-scsi-ignore-errors-from-scsi_dh_add_device.patch
index 03e8664..a3f3f1e 100644
--- a/openpower/linux/linux-0005-scsi-ignore-errors-from-scsi_dh_add_device.patch
+++ b/openpower/linux/linux-0005-scsi-ignore-errors-from-scsi_dh_add_device.patch
@@ -1,4 +1,4 @@
-From db2e8cc68f99b3c8f7fe01600ed62450dd7bd12e Mon Sep 17 00:00:00 2001
+From 055e0b8278b4f0e99026b4062d39dfaaa3c33aeb Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 1 Mar 2016 13:57:59 +1100
Subject: [PATCH 5/7] scsi: ignore errors from scsi_dh_add_device()
diff --git a/openpower/linux/linux-0006-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch b/openpower/linux/linux-0006-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
index 9fb0097..197129f 100644
--- a/openpower/linux/linux-0006-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
+++ b/openpower/linux/linux-0006-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
@@ -1,4 +1,4 @@
-From c8c04de128263a3122517a70935e60aed357b1be Mon Sep 17 00:00:00 2001
+From 42fd6dd412de647537109564645d81538d8e267f Mon Sep 17 00:00:00 2001
From: Huy Nguyen <huyn@mellanox.com>
Date: Wed, 17 Feb 2016 17:24:26 +0200
Subject: [PATCH 6/7] net/mlx4_core: Set UAR page size to 4KB regardless of
diff --git a/openpower/linux/linux-0007-Release-4.4.3-openpower2.patch b/openpower/linux/linux-0007-Release-4.4.3-openpower2.patch
deleted file mode 100644
index c9f7628..0000000
--- a/openpower/linux/linux-0007-Release-4.4.3-openpower2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7817dfcac99fc23993be54fe1a6fbbe3416bc79 Mon Sep 17 00:00:00 2001
-From: Joel Stanley <joel@jms.id.au>
-Date: Tue, 20 Oct 2015 15:01:06 +1030
-Subject: [PATCH 7/7] Release 4.4.3-openpower2
-
- - ast: Switch SCU to VGA output on POST
- - scsi: ignore errors from scsi_dh_add_device()
- - mlx4: Set UAR page size to 4KB regardless of system page size
-
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 802be10c40c5..898d37d2de72 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 4
- PATCHLEVEL = 4
- SUBLEVEL = 3
--EXTRAVERSION =
-+EXTRAVERSION = -openpower2
- NAME = Blurry Fish Butt
-
- # *DOCUMENTATION*
---
-2.7.0
-
diff --git a/openpower/linux/linux-0007-Release-4.4.4-openpower1.patch b/openpower/linux/linux-0007-Release-4.4.4-openpower1.patch
new file mode 100644
index 0000000..2eb94bf
--- /dev/null
+++ b/openpower/linux/linux-0007-Release-4.4.4-openpower1.patch
@@ -0,0 +1,26 @@
+From d358107befbf8f80329274837938a426afbc0f43 Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel@jms.id.au>
+Date: Tue, 20 Oct 2015 15:01:06 +1030
+Subject: [PATCH 7/7] Release 4.4.4-openpower1
+
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 344bc6f27ea1..a350bd11456d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+ SUBLEVEL = 4
+-EXTRAVERSION =
++EXTRAVERSION = -openpower1
+ NAME = Blurry Fish Butt
+
+ # *DOCUMENTATION*
+--
+2.7.0
+