Merge pull request #715 from shenki/linux-4.4.30-openpower1

stewartsmith · web-flow · commit 3a772f9372cc · 2016-11-02T18:52:04.000+11:00
Release 4.4.30-openpower1
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firenze-firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,4 +1,4 @@
-From af96227bff765957837f3075ec478418e3dd4fd2 Mon Sep 17 00:00:00 2001
+From 537ad23ca2f46f712a7d4042fccb6ab984aff3a0 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/9] xhci: Use xhci_pci_remove for xhci device shutdown
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
@@ -1,4 +1,4 @@
-From b5ec8892da4b21b58495fce0164016b4b12fb85a Mon Sep 17 00:00:00 2001
+From a03f729fea2448c45ece285d53f564d72b43f985 Mon Sep 17 00:00:00 2001
 From: Jeremy Kerr <jk@ozlabs.org>
 Date: Wed, 2 Mar 2016 11:25:47 +0800
 Subject: [PATCH 2/9] drivers/drm/ast: Switch SCU to VGA output on POST
diff --git a/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
@@ -1,4 +1,4 @@
-From 8f4e6ea8812cfc7dfbdfaaf6f9ad264664856b78 Mon Sep 17 00:00:00 2001
+From f601ed73726bdc5ca0b16d951ba6d126b7fd9176 Mon Sep 17 00:00:00 2001
 From: Huy Nguyen <huyn@mellanox.com>
 Date: Wed, 17 Feb 2016 17:24:26 +0200
 Subject: [PATCH 3/9] net/mlx4_core: Set UAR page size to 4KB regardless of
diff --git a/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,4 +1,4 @@
-From b815d81e10ca51aa91e6ca2b771afe9d0351669c Mon Sep 17 00:00:00 2001
+From ff752455485aed8aa9ed0bc7ef1652603aed184f Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 19 Jul 2016 22:43:26 +0930
 Subject: [PATCH 4/9] xhci: do not halt the secondary HCD
diff --git a/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
@@ -1,4 +1,4 @@
-From f00bd9648a50f06e77c04a36c4506e36ea0a27e0 Mon Sep 17 00:00:00 2001
+From a7a0ec5e8015b1fdd2fc7c20b5885d1796c5aacf Mon Sep 17 00:00:00 2001
 From: Carol L Soto <clsoto@linux.vnet.ibm.com>
 Date: Tue, 12 Jul 2016 17:04:07 -0500
 Subject: [PATCH 5/9] net/mlx5: Add pci shutdown callback
diff --git a/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
@@ -1,4 +1,4 @@
-From cabcd837a5fd9c508014c909fd118caa441de4fa Mon Sep 17 00:00:00 2001
+From 6b45a03747469b4bd1d35f66809525bcdbc501fc Mon Sep 17 00:00:00 2001
 From: Oliver O'Halloran <oohall@gmail.com>
 Date: Fri, 24 Jun 2016 17:28:43 +1000
 Subject: [PATCH 6/9] powerpc/boot: Add OPAL console to epapr wrappers
diff --git a/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
@@ -1,4 +1,4 @@
-From 23126f5146ee4c38b5b0e0c4b7c1d83b238a6a79 Mon Sep 17 00:00:00 2001
+From b8e00efc9b4184b54507c862b3e1e675a10a9a21 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
 Date: Wed, 13 Jul 2016 11:15:42 +1000
 Subject: [PATCH 7/9] tty/hvc: Use opal irqchip interface if available
diff --git a/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
@@ -1,4 +1,4 @@
-From 0fa346c28542289c83318f6c44e31324ed10b7da Mon Sep 17 00:00:00 2001
+From e43a1ff94894954e3f406388d44fd250608a6097 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
 Date: Wed, 13 Jul 2016 11:15:41 +1000
 Subject: [PATCH 8/9] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
diff --git a/openpower/linux/0009-Release-4.4.30-openpower1.patch b/openpower/linux/0009-Release-4.4.30-openpower1.patch
@@ -1,21 +1,21 @@
-From 227c8220f732948abda6d1af1e5050e0c148cf45 Mon Sep 17 00:00:00 2001
+From 00bf35267eafcaec1e56b2a1d5339d8ddbb5029a Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 16 Aug 2016 23:00:23 +0930
-Subject: [PATCH 9/9] Release 4.4.27-openpower1
+Subject: [PATCH 9/9] Release 4.4.30-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 b6ee4ce561f8..1a3f055fb912 100644
+index 98239d56924c..d2fcd22935eb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 4
- SUBLEVEL = 27
+ SUBLEVEL = 30
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Blurry Fish Butt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From af96227bff765957837f3075ec478418e3dd4fd2 Mon Sep 17 00:00:00 2001`
	`1`	`+From 537ad23ca2f46f712a7d4042fccb6ab984aff3a0 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Thadeu Lima De Souza Cascardo <[email protected]>`
`3`	`3`	`Date: Tue, 25 Mar 2014 10:45:16 -0400`
`4`	`4`	`Subject: [PATCH 1/9] xhci: Use xhci_pci_remove for xhci device shutdown`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From b5ec8892da4b21b58495fce0164016b4b12fb85a Mon Sep 17 00:00:00 2001`
	`1`	`+From a03f729fea2448c45ece285d53f564d72b43f985 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Jeremy Kerr <[email protected]>`
`3`	`3`	`Date: Wed, 2 Mar 2016 11:25:47 +0800`
`4`	`4`	`Subject: [PATCH 2/9] drivers/drm/ast: Switch SCU to VGA output on POST`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 8f4e6ea8812cfc7dfbdfaaf6f9ad264664856b78 Mon Sep 17 00:00:00 2001`
	`1`	`+From f601ed73726bdc5ca0b16d951ba6d126b7fd9176 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Huy Nguyen <[email protected]>`
`3`	`3`	`Date: Wed, 17 Feb 2016 17:24:26 +0200`
`4`	`4`	`Subject: [PATCH 3/9] net/mlx4_core: Set UAR page size to 4KB regardless of`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From b815d81e10ca51aa91e6ca2b771afe9d0351669c Mon Sep 17 00:00:00 2001`
	`1`	`+From ff752455485aed8aa9ed0bc7ef1652603aed184f Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Joel Stanley <[email protected]>`
`3`	`3`	`Date: Tue, 19 Jul 2016 22:43:26 +0930`
`4`	`4`	`Subject: [PATCH 4/9] xhci: do not halt the secondary HCD`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From f00bd9648a50f06e77c04a36c4506e36ea0a27e0 Mon Sep 17 00:00:00 2001`
	`1`	`+From a7a0ec5e8015b1fdd2fc7c20b5885d1796c5aacf Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Carol L Soto <[email protected]>`
`3`	`3`	`Date: Tue, 12 Jul 2016 17:04:07 -0500`
`4`	`4`	`Subject: [PATCH 5/9] net/mlx5: Add pci shutdown callback`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From cabcd837a5fd9c508014c909fd118caa441de4fa Mon Sep 17 00:00:00 2001`
	`1`	`+From 6b45a03747469b4bd1d35f66809525bcdbc501fc Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Oliver O'Halloran <[email protected]>`
`3`	`3`	`Date: Fri, 24 Jun 2016 17:28:43 +1000`
`4`	`4`	`Subject: [PATCH 6/9] powerpc/boot: Add OPAL console to epapr wrappers`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 23126f5146ee4c38b5b0e0c4b7c1d83b238a6a79 Mon Sep 17 00:00:00 2001`
	`1`	`+From b8e00efc9b4184b54507c862b3e1e675a10a9a21 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Samuel Mendoza-Jonas <[email protected]>`
`3`	`3`	`Date: Wed, 13 Jul 2016 11:15:42 +1000`
`4`	`4`	`Subject: [PATCH 7/9] tty/hvc: Use opal irqchip interface if available`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 0fa346c28542289c83318f6c44e31324ed10b7da Mon Sep 17 00:00:00 2001`
	`1`	`+From e43a1ff94894954e3f406388d44fd250608a6097 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Samuel Mendoza-Jonas <[email protected]>`
`3`	`3`	`Date: Wed, 13 Jul 2016 11:15:41 +1000`
`4`	`4`	`Subject: [PATCH 8/9] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles`