Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedora

32 files changed, 271 insertions, 49 deletions

diff --git a/0001-efi-libstub-Treat-missing-SecureBoot-variable-as-Sec.patch b/0001-efi-libstub-Treat-missing-SecureBoot-variable-as-Sec.patch
new file mode 100644
index 000000000..3bbdac708
--- /dev/null
+++ b/0001-efi-libstub-Treat-missing-SecureBoot-variable-as-Sec.patch
@@ -0,0 +1,53 @@
+From 52e51f16407b7b34e26affb500a21e250d9fce0b Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Date: Wed, 1 Mar 2017 19:04:35 +0000
+Subject: [PATCH] efi/libstub: Treat missing SecureBoot variable as Secure Boot
+ disabled
+
+The newly refactored code that infers the firmware's Secure Boot state
+prints the following error when the EFI variable 'SecureBoot' does not
+exist:
+
+  EFI stub: ERROR: Could not determine UEFI Secure Boot status.
+
+However, this variable is only guaranteed to be defined on a system that
+is Secure Boot capable to begin with, and so it is not an error if it is
+missing. So report Secure Boot as being disabled in this case, without
+printing any error messages.
+
+Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Matt Fleming <matt@codeblueprint.co.uk>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: linux-efi@vger.kernel.org
+Link: http://lkml.kernel.org/r/1488395076-29712-2-git-send-email-ard.biesheuvel@linaro.org
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+ drivers/firmware/efi/libstub/secureboot.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c
+index 6def402..5da36e5 100644
+--- a/drivers/firmware/efi/libstub/secureboot.c
++++ b/drivers/firmware/efi/libstub/secureboot.c
+@@ -45,6 +45,8 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg)
+ 	size = sizeof(secboot);
+ 	status = get_efi_var(efi_SecureBoot_name, &efi_variable_guid,
+ 			     NULL, &size, &secboot);
++	if (status == EFI_NOT_FOUND)
++		goto secure_boot_disabled;
+ 	if (status != EFI_SUCCESS)
+ 		goto out_efi_err;
+
+@@ -78,7 +80,5 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg)
+
+ out_efi_err:
+ 	pr_efi_err(sys_table_arg, "Could not determine UEFI Secure Boot status.\n");
+-	if (status == EFI_NOT_FOUND)
+-		goto secure_boot_disabled;
+ 	return efi_secureboot_mode_unknown;
+ }
+-- 
+2.9.3
+
diff --git a/0001-ping-implement-proper-locking.patch b/0001-ping-implement-proper-locking.patch
new file mode 100644
index 000000000..1fad1a8cb
--- /dev/null
+++ b/0001-ping-implement-proper-locking.patch
@@ -0,0 +1,53 @@
+From 43a6684519ab0a6c52024b5e25322476cabad893 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Fri, 24 Mar 2017 19:36:13 -0700
+Subject: [PATCH] ping: implement proper locking
+
+We got a report of yet another bug in ping
+
+http://www.openwall.com/lists/oss-security/2017/03/24/6
+
+->disconnect() is not called with socket lock held.
+
+Fix this by acquiring ping rwlock earlier.
+
+Thanks to Daniel, Alexander and Andrey for letting us know this problem.
+
+Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: Daniel Jiang <danieljiang0415@gmail.com>
+Reported-by: Solar Designer <solar@openwall.com>
+Reported-by: Andrey Konovalov <andreyknvl@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/ipv4/ping.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
+index 2af6244..ccfbce1 100644
+--- a/net/ipv4/ping.c
++++ b/net/ipv4/ping.c
+@@ -156,17 +156,18 @@ int ping_hash(struct sock *sk)
+ void ping_unhash(struct sock *sk)
+ {
+ 	struct inet_sock *isk = inet_sk(sk);
++
+ 	pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num);
++	write_lock_bh(&ping_table.lock);
+ 	if (sk_hashed(sk)) {
+-		write_lock_bh(&ping_table.lock);
+ 		hlist_nulls_del(&sk->sk_nulls_node);
+ 		sk_nulls_node_init(&sk->sk_nulls_node);
+ 		sock_put(sk);
+ 		isk->inet_num = 0;
+ 		isk->inet_sport = 0;
+ 		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
+-		write_unlock_bh(&ping_table.lock);
+ 	}
++	write_unlock_bh(&ping_table.lock);
+ }
+ EXPORT_SYMBOL_GPL(ping_unhash);
+
+-- 
+2.9.3
+
diff --git a/0001-x86-mce-Don-t-print-MCEs-when-mcelog-is-active.patch b/0001-x86-mce-Don-t-print-MCEs-when-mcelog-is-active.patch
new file mode 100644
index 000000000..d682dcc42
--- /dev/null
+++ b/0001-x86-mce-Don-t-print-MCEs-when-mcelog-is-active.patch
@@ -0,0 +1,65 @@
+From cc66afea58f858ff6da7f79b8a595a67bbb4f9a9 Mon Sep 17 00:00:00 2001
+From: Andi Kleen <ak@linux.intel.com>
+Date: Mon, 27 Mar 2017 11:32:59 +0200
+Subject: [PATCH] x86/mce: Don't print MCEs when mcelog is active
+
+Since:
+
+  cd9c57cad3fe ("x86/MCE: Dump MCE to dmesg if no consumers")
+
+all MCEs are printed even when mcelog is running. Fix the regression to
+not print to dmesg when mcelog is running as it is a consumer too.
+
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+[ Massage commit message. ]
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Tony Luck <tony.luck@intel.com>
+Cc: linux-edac <linux-edac@vger.kernel.org>
+Cc: stable@vger.kernel.org # 4.10..
+Fixes: cd9c57cad3fe ("x86/MCE: Dump MCE to dmesg if no consumers")
+Link: http://lkml.kernel.org/r/20170327093304.10683-2-bp@alien8.de
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+ arch/x86/kernel/cpu/mcheck/mce.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+index 8e9725c..5accfbd 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
+@@ -54,6 +54,8 @@
+
+ static DEFINE_MUTEX(mce_chrdev_read_mutex);
+
++static int mce_chrdev_open_count;	/* #times opened */
++
+ #define mce_log_get_idx_check(p) \
+ ({ \
+ 	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
+@@ -598,6 +600,10 @@ static int mce_default_notifier(struct notifier_block *nb, unsigned long val,
+ 	if (atomic_read(&num_notifiers) > 2)
+ 		return NOTIFY_DONE;
+
++	/* Don't print when mcelog is running */
++	if (mce_chrdev_open_count > 0)
++		return NOTIFY_DONE;
++
+ 	__print_mce(m);
+
+ 	return NOTIFY_DONE;
+@@ -1828,7 +1834,6 @@ void mcheck_cpu_clear(struct cpuinfo_x86 *c)
+  */
+
+ static DEFINE_SPINLOCK(mce_chrdev_state_lock);
+-static int mce_chrdev_open_count;	/* #times opened */
+ static int mce_chrdev_open_exclu;	/* already open exclusive? */
+
+ static int mce_chrdev_open(struct inode *inode, struct file *file)
+-- 
+2.9.3
+
diff --git a/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM b/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
index b3f9fbf18..4e3c83368 100644
--- a/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
+++ b/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
@@ -1 +1 @@
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
diff --git a/baseconfig/CONFIG_NET_VENDOR_AMAZON b/baseconfig/CONFIG_NET_VENDOR_AMAZON
index 707bb5a54..71e03d079 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AMAZON
+++ b/baseconfig/CONFIG_NET_VENDOR_AMAZON
@@ -1 +1 @@
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX b/baseconfig/powerpc/CONFIG_DEV_DAX
new file mode 100644
index 000000000..77478a213
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_DEV_DAX
@@ -0,0 +1 @@
+CONFIG_DEV_DAX=m
diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM
new file mode 100644
index 000000000..8c7fd6732
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM
@@ -0,0 +1 @@
+CONFIG_DEV_DAX_PMEM=m
diff --git a/baseconfig/powerpc/CONFIG_NR_DEV_DAX b/baseconfig/powerpc/CONFIG_NR_DEV_DAX
new file mode 100644
index 000000000..3fd0f86b1
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_NR_DEV_DAX
@@ -0,0 +1 @@
+CONFIG_NR_DEV_DAX=32768
diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
index 4874a851b..75d999c66 100644
--- a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
@@ -1 +1 @@
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
new file mode 100644
index 000000000..f9a942f2c
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
@@ -0,0 +1 @@
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
diff --git a/baseconfig/x86/CONFIG_ENA_ETHERNET b/baseconfig/x86/CONFIG_ENA_ETHERNET
new file mode 100644
index 000000000..64c0a73c1
--- /dev/null
+++ b/baseconfig/x86/CONFIG_ENA_ETHERNET
@@ -0,0 +1 @@
+CONFIG_ENA_ETHERNET=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 47d3cc6a1..819c50e8a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2426,7 +2426,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 # CONFIG_IWMMXT is not set
 CONFIG_IXGBE_DCA=y
@@ -3391,7 +3391,7 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6144050b9..a47228fd8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2409,7 +2409,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 # CONFIG_IWMMXT is not set
 CONFIG_IXGBE_DCA=y
@@ -3370,7 +3370,7 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 40c48fd97..ffadf9aea 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2606,7 +2606,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IWMMXT=y
 CONFIG_IXGBE_DCA=y
@@ -3659,7 +3659,7 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index bf34c8ac6..dc6d68dcc 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2494,7 +2494,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IWMMXT=y
 CONFIG_IXGBE_DCA=y
@@ -3507,7 +3507,7 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 77a31c78e..1d2fa42ef 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2478,7 +2478,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IWMMXT=y
 CONFIG_IXGBE_DCA=y
@@ -3487,7 +3487,7 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 2f2f90f60..1aa3356e9 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2590,7 +2590,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IWMMXT=y
 CONFIG_IXGBE_DCA=y
@@ -3639,7 +3639,7 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 119c28192..8ad0bc288 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1306,6 +1306,7 @@ CONFIG_EFI=y
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2348,7 +2349,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3289,7 +3290,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index c8b90a377..70973d0e2 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1316,6 +1316,7 @@ CONFIG_EFI=y
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2365,7 +2366,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3308,7 +3309,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index bcd8b4c3a..1931dc048 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1316,6 +1316,7 @@ CONFIG_EFI=y
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2365,7 +2366,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3308,7 +3309,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-i686.config b/kernel-i686.config
index a22ab7695..c0811c97a 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1306,6 +1306,7 @@ CONFIG_EFI=y
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2348,7 +2349,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3289,7 +3290,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 6b584ae99..65553ea78 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -987,6 +987,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -2249,7 +2251,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3166,7 +3168,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -3435,6 +3437,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -5039,7 +5042,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index ae49e786d..b760ea929 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -978,6 +978,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -2232,7 +2234,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3145,7 +3147,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -3414,6 +3416,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -5016,7 +5019,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 4a31b7cba..b2eb1be09 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -942,6 +942,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -2195,7 +2197,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3111,7 +3113,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -3380,6 +3382,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4968,7 +4971,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 10596a11e..d2bb881c2 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -933,6 +933,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -2178,7 +2180,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3090,7 +3092,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -3359,6 +3361,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4945,7 +4948,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 4b6793b73..84fd40d09 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -942,6 +942,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -2194,7 +2196,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3110,7 +3112,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -3379,6 +3381,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4967,7 +4970,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 4b6ac4b67..9c032c8b5 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -933,6 +933,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -2177,7 +2179,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3089,7 +3091,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -3358,6 +3360,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4944,7 +4947,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 2a5eafdf0..c305568d2 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2144,7 +2144,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3045,7 +3045,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_NET_VENDOR_ARC is not set
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ec33d33cc..b82aac843 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2127,7 +2127,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3024,7 +3024,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_NET_VENDOR_ARC is not set
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index ab4c6fb72..3afcba16f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1349,6 +1349,7 @@ CONFIG_EFI=y
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2401,7 +2402,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3330,7 +3331,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index cbafbf63f..28319571b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1339,6 +1339,7 @@ CONFIG_EFI=y
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2384,7 +2385,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 # CONFIG_IWM is not set
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -3311,7 +3312,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 CONFIG_NET_VENDOR_ALTEON=y
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
diff --git a/kernel.spec b/kernel.spec
index fbb3251cc..156ae8060 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -628,6 +628,14 @@ Patch857: vmwgfx-check-that-number-of-mip-levels-is-above-zero.patch
 #CVE-2017-7277 rhbz 1436629 1436661
 Patch858: tcp-mark-skbs-with-SCM_TIMESTAMPING_OPT_STATS.patch
 
+# rhbz 1438316
+Patch859: 0001-x86-mce-Don-t-print-MCEs-when-mcelog-is-active.patch
+
+# CVE-2017-2671 rhbz 1436649 1436663
+Patch860: 0001-ping-implement-proper-locking.patch
+
+Patch861: 0001-efi-libstub-Treat-missing-SecureBoot-variable-as-Sec.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2200,6 +2208,14 @@ fi
 #
 #
 %changelog
+* Wed Apr 05 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Don't print MCEs when mcelog is running (rhbz 1438316)
+- CVE-2017-2671 Fix ping locking (rhbz 1436649 1436663)
+- Fix secureboot ERROR
+
+* Tue Apr 04 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- redisable CONFIG_IWLWIFI_PCIE_RTPM (rhbz 1429135)
+
 * Fri Mar 31 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.8-200
 - Linux v4.10.8