Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc24

25 files changed, 41 insertions, 26 deletions

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/arm/arm64/CONFIG_VDSO b/baseconfig/arm/arm64/CONFIG_VDSO
new file mode 100644
index 000000000..cab5ebafb
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_VDSO
@@ -0,0 +1 @@
+CONFIG_VDSO=y
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_VDSO b/baseconfig/arm/armv7/lpae/CONFIG_VDSO
new file mode 100644
index 000000000..cab5ebafb
--- /dev/null
+++ b/baseconfig/arm/armv7/lpae/CONFIG_VDSO
@@ -0,0 +1 @@
+CONFIG_VDSO=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/gitrev b/gitrev
index edce105a6..5f72884ba 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-ea6b1720ce25f92f7a17b2e0c2b653d20773d10a
+269c930e6698e6afa6d4606bfd241f4497597e79
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7294b87e0..074457d35 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3413,7 +3413,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
@@ -5949,7 +5949,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
-# CONFIG_VDSO is not set
+CONFIG_VDSO=y
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
 CONFIG_VEXPRESS_SYSCFG=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 022c906d5..25016612c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3392,7 +3392,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
@@ -5926,7 +5926,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
-# CONFIG_VDSO is not set
+CONFIG_VDSO=y
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
 CONFIG_VEXPRESS_SYSCFG=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 276db2d10..10b8c7182 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3677,7 +3677,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 2313b9fe8..96b36661a 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3515,7 +3515,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
@@ -6114,7 +6114,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
-# CONFIG_VDSO is not set
+CONFIG_VDSO=y
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
 CONFIG_VEXPRESS_SYSCFG=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b40f4e279..82208ebf6 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3494,7 +3494,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
@@ -6091,7 +6091,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
-# CONFIG_VDSO is not set
+CONFIG_VDSO=y
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
 CONFIG_VEXPRESS_SYSCFG=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 562587de3..3c3dc6ff3 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3656,7 +3656,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 151a78a7a..c84ec515d 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1313,6 +1313,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
@@ -3314,7 +3315,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 416b5ec0a..6dc7d7e87 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1324,6 +1324,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
@@ -3334,7 +3335,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index ccd60a13f..2b1a5a106 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1324,6 +1324,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
@@ -3334,7 +3335,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 442a1b671..cf02575a4 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1313,6 +1313,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
@@ -3314,7 +3315,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3bcd9476a..e8e73f933 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3161,7 +3161,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index c2a86d370..72743ef0f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3139,7 +3139,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 68d8b6bb0..8d2a54f5f 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3106,7 +3106,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index ac763ed0e..29c3dc97e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3084,7 +3084,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 78f82cd40..cd1ed79cc 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -3105,7 +3105,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index ef87b0a4f..07cdc6ea6 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -3083,7 +3083,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 93c5890ed..def1583e2 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1358,6 +1358,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
@@ -3358,7 +3359,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 9acc28d46..cbee0a1ce 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1347,6 +1347,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
@@ -3338,7 +3339,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_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
diff --git a/kernel.spec b/kernel.spec
index 5586eb2cd..49701c0ef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2189,6 +2189,12 @@ fi
 #
 #
 %changelog
+* Fri Apr 07 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc5.git4.1
+- Linux v4.11-rc5-152-g269c930
+
+* Fri Apr  7 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable VDSO for aarch64 and ARMv7-LPAE
+
 * Thu Apr 06 2017 Laura Abbott <labbott@fedoraproject.org>
 - Fix for powerpc booting with large initrd (rhbz 1435154)
 
diff --git a/sources b/sources
index 0fa35f797..9ff6aeea9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
 SHA512 (patch-4.11-rc5.xz) = 9b8b728eb8bb679d012c90f878739f02a3c9d13eb916248550fc61fad5a7ac5a0aee9c8166ff0c8b3180b96679f69ffbb5f79992f02a1693fd2c3616df1f6dd1
-SHA512 (patch-4.11-rc5-git3.xz) = 171a22621c5e37a7c53e62b77e46f924aa6e9102d4eefb1023bd31f3823f60b58bd86ae3381f010aefcfc20b7735038aefa5cc4b7ea74bace94b08469322a358
+SHA512 (patch-4.11-rc5-git4.xz) = a376981267f517fbe6777beb8a2b7f5670890fed668ec002d043512a224c469500065c832e3ca11f6dbeeae899b21ec39e7c872d0add0c2857aa9a1e37d71f42