Merge remote-tracking branch 'origin/master'kernel-4.8.0-0.rc1.git5.1.vanilla.knurd.1.fc26kernel-4.8.0-0.rc1.git5.1.vanilla.knurd.1.fc25kernel-4.8.0-0.rc1.git5.1.vanilla.knurd.1.fc24kernel-4.8.0-0.rc1.git5.1.vanilla.knurd.1.fc23

11 files changed, 109 insertions, 69 deletions

diff --git a/0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch b/0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch
deleted file mode 100644
index 276e2be32..000000000
--- a/0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6abb0cfdc1f6a42367a20ac2baf4099fc8af08b5 Mon Sep 17 00:00:00 2001
-From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
-Date: Wed, 10 Aug 2016 09:54:30 -0700
-Subject: [PATCH] mm, rmap: fix false positive VM_BUG() in page_add_file_rmap()
-
-PageTransCompound() doesn't distinguish THP from from any other type of
-compound pages. This can lead to false-positive VM_BUG_ON() in
-page_add_file_rmap() if called on compound page from a driver[1].
-
-I think we can exclude such cases by checking if the page belong to a
-mapping.
-
-The VM_BUG_ON_PAGE() is downgraded to VM_WARN_ON_ONCE(). This path
-should not cause any harm to non-THP page, but good to know if we step
-on anything else.
-
-[1]
-http://lkml.kernel.org/r/c711e067-0bff-a6cb-3c37-04dfe77d2db1@redhat.com
-
-Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
-Reported-by: Laura Abbott <labbott@redhat.com>
----
- mm/rmap.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/mm/rmap.c b/mm/rmap.c
-index 709bc83..d4f5606 100644
---- a/mm/rmap.c
-+++ b/mm/rmap.c
-@@ -1284,8 +1284,9 @@ void page_add_file_rmap(struct page *page, bool compound)
- 		VM_BUG_ON_PAGE(!PageSwapBacked(page), page);
- 		__inc_node_page_state(page, NR_SHMEM_PMDMAPPED);
- 	} else {
--		if (PageTransCompound(page)) {
--			VM_BUG_ON_PAGE(!PageLocked(page), page);
-+		if (PageTransCompound(page) && page_mapping(page)) {
-+			VM_WARN_ON_ONCE(!PageLocked(page));
-+
- 			SetPageDoubleMap(compound_head(page));
- 			if (PageMlocked(page))
- 				clear_page_mlock(compound_head(page));
--- 
-2.7.4
-
diff --git a/config-arm-generic b/config-arm-generic
index cc5314aa9..e4e705670 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -80,6 +80,7 @@ CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA512_ARM=y
+CONFIG_TCG_TIS_I2C_ATMEL=m
 
 # EDAC
 CONFIG_EDAC=y
diff --git a/config-arm64 b/config-arm64
index 2fc5f6d27..5ec79ca83 100644
--- a/config-arm64
+++ b/config-arm64
@@ -8,6 +8,7 @@ CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_THUNDER=y
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM2835 is not set
@@ -19,7 +20,6 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_THUNDER is not set
 # CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCH_UNIPHIER is not set
@@ -34,6 +34,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 
@@ -108,6 +109,16 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_CONFIGFS=m
 
+CONFIG_NUMA=y
+CONFIG_ACPI_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NODES_SHIFT=9
+
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
@@ -169,7 +180,9 @@ CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_TEGRA210_ADMA=y
 CONFIG_MFD_MAX77620=y
+CONFIG_PINCTRL_MAX77620=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_GPIO_MAX77620=m
 # CONFIG_GPIO_TEGRA is not set
 # CONFIG_TEGRA_ACONNECT is not set
 
@@ -257,17 +270,19 @@ CONFIG_QCOM_COINCELL=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
 # CONFIG_QCOM_Q6V5_PIL is not set
 
+# mvebu
+# CONFIG_MV_XOR_V2 is not set
+
 # ThunderX
 # CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_THUNDER is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-
-CONFIG_DMI=y
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-
-# CONFIG_MV_XOR_V2 is not set
+CONFIG_MDIO_THUNDER=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+# CONFIG_LIQUIDIO is not set
 
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_AHCI_SEATTLE=m
@@ -300,7 +315,4 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 # CONFIG_IMX_THERMAL is not set
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 
-# Will probably need to be changed later
-# CONFIG_NUMA is not set
-
 # CONFIG_BCM_PDC_MBOX is not set
diff --git a/config-s390x b/config-s390x
index 0f0b5470c..cb769ac09 100644
--- a/config-s390x
+++ b/config-s390x
@@ -179,6 +179,7 @@ CONFIG_QETH_L3=m
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
 CONFIG_S390_GUEST=y
+CONFIG_S390_GUEST_OLD_TRANSPORT=y
 CONFIG_VIRTIO_CONSOLE=y
 
 
diff --git a/config-x86-generic b/config-x86-generic
index b925fbd05..7df9a0751 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -86,7 +86,6 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_FAN=y
-CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 8cdc4ca78..592093575 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -9,14 +9,15 @@ CONFIG_GENERIC_CPU=y
 CONFIG_X86_UV=y
 CONFIG_UV_MMTIMER=m
 CONFIG_NUMA=y
+CONFIG_ACPI_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NFIT=m
 # CONFIG_ACPI_NFIT_DEBUG is not set
 # CONFIG_NUMA_EMU is not set
 CONFIG_X86_NUMACHIP=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 
 # https://lists.fedoraproject.org/pipermail/kernel/2013-November/004601.html
 CONFIG_NR_CPUS=1024
diff --git a/gitrev b/gitrev
index ac1b00edc..40cc12dc8 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-9512c47ec2e4f7e1f28ba66e09de536987a6057f
+99091700659f4df965e138b38b4fa26a29b7eade
diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch
index 7e8cba5b9..d79a6186b 100644
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@@ -42,8 +42,8 @@ index 6abffb7..7b103bb 100644
  
  # actual build commands
  quiet_cmd_vdso32ld = VDSO32L $@
--      cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@
-+      cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@ \
+-      cmd_vdso32ld = $(CROSS32CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
++      cmd_vdso32ld = $(CROSS32CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) \
 +		     $(if $(AFTER_LINK),; $(AFTER_LINK))
  quiet_cmd_vdso32as = VDSO32A $@
        cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
@@ -56,8 +56,8 @@ index 8c8f2ae..a743ebe 100644
  
  # actual build commands
  quiet_cmd_vdso64ld = VDSO64L $@
--      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@
-+      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \
+-      cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
++      cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) \
 +		     $(if $(AFTER_LINK),; $(AFTER_LINK))
  quiet_cmd_vdso64as = VDSO64A $@
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
diff --git a/kernel.spec b/kernel.spec
index 87f668cbd..de4cad208 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -594,7 +594,8 @@ Patch494: disable-i8042-check-on-apple-mac.patch
 
 Patch495: lis3-improve-handling-of-null-rate.patch
 
-Patch496: watchdog-Disable-watchdog-on-virtual-machines.patch
+# In theory this has been fixed so should no longer be needed, it also causes problems with aarch64 DMI, so disable to see for sure if it's fixed
+# Patch496: watchdog-Disable-watchdog-on-virtual-machines.patch
 
 Patch497: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
@@ -618,8 +619,8 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 # https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/message/A4YCP7OGMX6JLFT5V44H57GOMAQLC3M4/
 Patch839: drm-i915-Acquire-audio-powerwell-for-HD-Audio-regist.patch
 
-#rhbz 1365686
-Patch840: 0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch
+#rhbz 1361414
+Patch841: openstack_fix.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -2158,6 +2159,22 @@ fi
 #
 #
 %changelog
+* Fri Aug 12 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc1.git5.1
+- Linux v4.8-rc1-166-g9909170
+
+* Thu Aug 11 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc1.git4.1
+- Linux v4.8-rc1-88-g3b3ce01
+
+* Thu Aug 11 2016 Laura Abbott <labbott@fedoraproject.org>
+- Fix for crash seen with open stack (rhbz 1361414)
+
+* Thu Aug 11 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config updates
+- Disable long running watchdog in VM patch (in theory fixed)
+- Enable NUMA on aarch64
+- Enable Cavium ThunderX
+- Enable Atmel i2c TPM on ARM platforms
+
 * Wed Aug 10 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc1.git3.1
 - Linux v4.8-rc1-70-g9512c47
 
diff --git a/openstack_fix.patch b/openstack_fix.patch
new file mode 100644
index 000000000..a967c350e
--- /dev/null
+++ b/openstack_fix.patch
@@ -0,0 +1,53 @@
+From 5ef9f289c4e698054e5687edb54f0da3cdc9173a Mon Sep 17 00:00:00 2001
+From: Ian Wienand <iwienand@redhat.com>
+Date: Wed, 3 Aug 2016 15:44:57 +1000
+Subject: OVS: Ignore negative headroom value
+
+net_device->ndo_set_rx_headroom (introduced in
+871b642adebe300be2e50aa5f65a418510f636ec) says
+
+  "Setting a negtaive value reset the rx headroom
+   to the default value".
+
+It seems that the OVS implementation in
+3a927bc7cf9d0fbe8f4a8189dd5f8440228f64e7 overlooked this and sets
+dev->needed_headroom unconditionally.
+
+This doesn't have an immediate effect, but can mess up later
+LL_RESERVED_SPACE calculations, such as done in
+net/ipv6/mcast.c:mld_newpack.  For reference, this issue was found
+from a skb_panic raised there after the length calculations had given
+the wrong result.
+
+Note the other current users of this interface
+(drivers/net/tun.c:tun_set_headroom and
+drivers/net/veth.c:veth_set_rx_headroom) are both checking this
+correctly thus need no modification.
+
+Thanks to Ben for some pointers from the crash dumps!
+
+Cc: Benjamin Poirier <bpoirier@suse.com>
+Cc: Paolo Abeni <pabeni@redhat.com>
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1361414
+Signed-off-by: Ian Wienand <iwienand@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/openvswitch/vport-internal_dev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
+index 434e04c..95c3614 100644
+--- a/net/openvswitch/vport-internal_dev.c
++++ b/net/openvswitch/vport-internal_dev.c
+@@ -140,7 +140,7 @@ internal_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
+ 
+ static void internal_set_rx_headroom(struct net_device *dev, int new_hr)
+ {
+-	dev->needed_headroom = new_hr;
++	dev->needed_headroom = new_hr < 0 ? 0 : new_hr;
+ }
+ 
+ static const struct net_device_ops internal_dev_netdev_ops = {
+-- 
+cgit v0.12
+
diff --git a/sources b/sources
index cf727b658..2f0545293 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5276563eb1f39a048e4a8a887408c031  linux-4.7.tar.xz
 fe259c02c75eec61d1aa4b1211f3c853  perf-man-4.7.tar.gz
 6c8676e10b08ae2fec819e728ac4555e  patch-4.8-rc1.xz
-b5b666d0ceba21bccddaf55023f9f512  patch-4.8-rc1-git3.xz
+06f151dfdf4534c4cc523a95878d96a1  patch-4.8-rc1-git5.xz