4.11.3-101.fc24.gnu

24 files changed, 104 insertions, 43 deletions

diff --git a/freed-ora/current/f24/actual_udpencap_fix.patch b/freed-ora/current/f24/actual_udpencap_fix.patch
new file mode 100644
index 000000000..bba8b7676
--- /dev/null
+++ b/freed-ora/current/f24/actual_udpencap_fix.patch
@@ -0,0 +1,45 @@
+From: Steffen Klassert <steffen.klassert@secunet.com>
+Subject: [PATCH] esp4: Fix udpencap for local TCP packets.
+
+Locally generated TCP packets are usually cloned, so we
+do skb_cow_data() on this packets. After that we need to
+reload the pointer to the esp header. On udpencap this
+header has an offset to skb_transport_header, so take this
+offset into account.
+
+Fixes: commit cac2661c53f ("esp4: Avoid skb_cow_data whenever possible")
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+---
+ net/ipv4/esp4.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
+index b1e2444..ab71fbb 100644
+--- a/net/ipv4/esp4.c
++++ b/net/ipv4/esp4.c
+@@ -223,6 +223,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
+ 	int extralen;
+ 	int tailen;
+ 	__be64 seqno;
++	int esp_offset = 0;
+ 	__u8 proto = *skb_mac_header(skb);
+ 
+ 	/* skb is pure payload to encrypt */
+@@ -288,6 +289,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
+ 			break;
+ 		}
+ 
++		esp_offset = (unsigned char *)esph - (unsigned char *)uh;
++
+ 		*skb_mac_header(skb) = IPPROTO_UDP;
+ 	}
+ 
+@@ -397,7 +400,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
+ 		goto error;
+ 	nfrags = err;
+ 	tail = skb_tail_pointer(trailer);
+-	esph = ip_esp_hdr(skb);
++	esph = (struct ip_esp_hdr *)(skb_transport_header(skb) + esp_offset);
+ 
+ skip_cow:
+ 	esp_output_fill_trailer(tail, tfclen, plen, proto);
diff --git a/freed-ora/current/f24/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT b/freed-ora/current/f24/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
index 95f043d68..83b61e1e1 100644
--- a/freed-ora/current/f24/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
+++ b/freed-ora/current/f24/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
@@ -1 +1 @@
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
diff --git a/freed-ora/current/f24/baseconfig/CONFIG_GPIO_SYSFS b/freed-ora/current/f24/baseconfig/CONFIG_GPIO_SYSFS
index 006904523..52708d181 100644
--- a/freed-ora/current/f24/baseconfig/CONFIG_GPIO_SYSFS
+++ b/freed-ora/current/f24/baseconfig/CONFIG_GPIO_SYSFS
@@ -1 +1 @@
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
diff --git a/freed-ora/current/f24/kernel-aarch64-debug.config b/freed-ora/current/f24/kernel-aarch64-debug.config
index c72a04dc9..37567937c 100644
--- a/freed-ora/current/f24/kernel-aarch64-debug.config
+++ b/freed-ora/current/f24/kernel-aarch64-debug.config
@@ -912,7 +912,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1686,7 +1686,7 @@ CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
diff --git a/freed-ora/current/f24/kernel-aarch64.config b/freed-ora/current/f24/kernel-aarch64.config
index 01a4d8bb2..f1d6e13d8 100644
--- a/freed-ora/current/f24/kernel-aarch64.config
+++ b/freed-ora/current/f24/kernel-aarch64.config
@@ -911,7 +911,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1669,7 +1669,7 @@ CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
diff --git a/freed-ora/current/f24/kernel-armv7hl-debug.config b/freed-ora/current/f24/kernel-armv7hl-debug.config
index 8513e7d83..dcfed3e28 100644
--- a/freed-ora/current/f24/kernel-armv7hl-debug.config
+++ b/freed-ora/current/f24/kernel-armv7hl-debug.config
@@ -964,7 +964,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_PROTO=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1823,7 +1823,7 @@ CONFIG_GPIO_PL061=y
 CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65218=m
diff --git a/freed-ora/current/f24/kernel-armv7hl-lpae-debug.config b/freed-ora/current/f24/kernel-armv7hl-lpae-debug.config
index 037a94fc7..065347a10 100644
--- a/freed-ora/current/f24/kernel-armv7hl-lpae-debug.config
+++ b/freed-ora/current/f24/kernel-armv7hl-lpae-debug.config
@@ -935,7 +935,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_PROTO=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1733,7 +1733,7 @@ CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65910=y
diff --git a/freed-ora/current/f24/kernel-armv7hl-lpae.config b/freed-ora/current/f24/kernel-armv7hl-lpae.config
index c6eab0d7a..949b9b0d6 100644
--- a/freed-ora/current/f24/kernel-armv7hl-lpae.config
+++ b/freed-ora/current/f24/kernel-armv7hl-lpae.config
@@ -933,7 +933,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_PROTO=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1716,7 +1716,7 @@ CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65910=y
diff --git a/freed-ora/current/f24/kernel-armv7hl.config b/freed-ora/current/f24/kernel-armv7hl.config
index f7f81be2c..98a66c8ad 100644
--- a/freed-ora/current/f24/kernel-armv7hl.config
+++ b/freed-ora/current/f24/kernel-armv7hl.config
@@ -962,7 +962,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_PROTO=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1806,7 +1806,7 @@ CONFIG_GPIO_PL061=y
 CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65218=m
diff --git a/freed-ora/current/f24/kernel-i686-PAE.config b/freed-ora/current/f24/kernel-i686-PAE.config
index 9308e127e..ab17ff7be 100644
--- a/freed-ora/current/f24/kernel-i686-PAE.config
+++ b/freed-ora/current/f24/kernel-i686-PAE.config
@@ -795,7 +795,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1580,7 +1580,7 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SODAVILLE is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-i686-PAEdebug.config b/freed-ora/current/f24/kernel-i686-PAEdebug.config
index 6837fcc91..25544ae63 100644
--- a/freed-ora/current/f24/kernel-i686-PAEdebug.config
+++ b/freed-ora/current/f24/kernel-i686-PAEdebug.config
@@ -797,7 +797,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1598,7 +1598,7 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SODAVILLE is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-i686-debug.config b/freed-ora/current/f24/kernel-i686-debug.config
index e390383da..2f7cad3b5 100644
--- a/freed-ora/current/f24/kernel-i686-debug.config
+++ b/freed-ora/current/f24/kernel-i686-debug.config
@@ -797,7 +797,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1598,7 +1598,7 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SODAVILLE is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-i686.config b/freed-ora/current/f24/kernel-i686.config
index d676c905e..5b5ab55f6 100644
--- a/freed-ora/current/f24/kernel-i686.config
+++ b/freed-ora/current/f24/kernel-i686.config
@@ -795,7 +795,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1580,7 +1580,7 @@ CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SODAVILLE is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-ppc64-debug.config b/freed-ora/current/f24/kernel-ppc64-debug.config
index fcc8620bf..17669ffaa 100644
--- a/freed-ora/current/f24/kernel-ppc64-debug.config
+++ b/freed-ora/current/f24/kernel-ppc64-debug.config
@@ -785,7 +785,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1500,7 +1500,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-ppc64.config b/freed-ora/current/f24/kernel-ppc64.config
index 63d90c9b0..7d84fc869 100644
--- a/freed-ora/current/f24/kernel-ppc64.config
+++ b/freed-ora/current/f24/kernel-ppc64.config
@@ -783,7 +783,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1482,7 +1482,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-ppc64le-debug.config b/freed-ora/current/f24/kernel-ppc64le-debug.config
index 754fa4475..e4c622a35 100644
--- a/freed-ora/current/f24/kernel-ppc64le-debug.config
+++ b/freed-ora/current/f24/kernel-ppc64le-debug.config
@@ -740,7 +740,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1454,7 +1454,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-ppc64le.config b/freed-ora/current/f24/kernel-ppc64le.config
index 643a5f63d..8a6fbf133 100644
--- a/freed-ora/current/f24/kernel-ppc64le.config
+++ b/freed-ora/current/f24/kernel-ppc64le.config
@@ -738,7 +738,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1436,7 +1436,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-ppc64p7-debug.config b/freed-ora/current/f24/kernel-ppc64p7-debug.config
index c0d15dcb0..29ba051e5 100644
--- a/freed-ora/current/f24/kernel-ppc64p7-debug.config
+++ b/freed-ora/current/f24/kernel-ppc64p7-debug.config
@@ -740,7 +740,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1453,7 +1453,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-ppc64p7.config b/freed-ora/current/f24/kernel-ppc64p7.config
index 43873fd45..6eec8fd9e 100644
--- a/freed-ora/current/f24/kernel-ppc64p7.config
+++ b/freed-ora/current/f24/kernel-ppc64p7.config
@@ -738,7 +738,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1435,7 +1435,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-s390x-debug.config b/freed-ora/current/f24/kernel-s390x-debug.config
index 7767a689e..5ed081e6c 100644
--- a/freed-ora/current/f24/kernel-s390x-debug.config
+++ b/freed-ora/current/f24/kernel-s390x-debug.config
@@ -735,7 +735,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1424,7 +1424,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-s390x.config b/freed-ora/current/f24/kernel-s390x.config
index 053c54bbb..c8e95aaf7 100644
--- a/freed-ora/current/f24/kernel-s390x.config
+++ b/freed-ora/current/f24/kernel-s390x.config
@@ -733,7 +733,7 @@ CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1406,7 +1406,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-x86_64-debug.config b/freed-ora/current/f24/kernel-x86_64-debug.config
index 43d356221..adba02612 100644
--- a/freed-ora/current/f24/kernel-x86_64-debug.config
+++ b/freed-ora/current/f24/kernel-x86_64-debug.config
@@ -804,7 +804,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1625,7 +1625,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel-x86_64.config b/freed-ora/current/f24/kernel-x86_64.config
index e866d2191..5d83bf5fa 100644
--- a/freed-ora/current/f24/kernel-x86_64.config
+++ b/freed-ora/current/f24/kernel-x86_64.config
@@ -802,7 +802,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1607,7 +1607,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/freed-ora/current/f24/kernel.spec b/freed-ora/current/f24/kernel.spec
index 0eaf78465..65810f241 100644
--- a/freed-ora/current/f24/kernel.spec
+++ b/freed-ora/current/f24/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 100
+%global baserelease 101
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -690,6 +690,10 @@ Patch676: 2-2-nvme-Quirk-APST-on-Intel-600P-P3100-devices.patch
 # Networking fix reported on bodhi
 Patch678: net-v2-ip6_tunnel-ip6_gre-fix-setting-of-DSCP-on-encapsulated-packets.patch
 
+# rhbz 1458222 1458499
+# As linked from http://marc.info/?l=linux-netdev&m=149336766030175&w=2
+Patch679: actual_udpencap_fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2350,6 +2354,18 @@ fi
 #
 # 
 %changelog
+* Mon Jun 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.3-101
+- Bump and build once again
+
+* Mon Jun 05 2017 Laura Abbott <labbott@fedoraproject.org>
+- Actually fix ipsec encapsulation problems (rhbz 1458222 1458499)
+
+* Fri Jun 02 2017 Laura Abbott <labbott@fedoraproject.org>
+- Turn CONFIG_GPIO_SYSFS back on
+
+* Fri Jun 02 2017 Laura Abbott <labbott@fedoraproject.org>
+- Enable Chromebook keyboard backlight (rhbz 1447031)
+
 * Fri Jun  2 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 4.11.3-gnu.
 - Deblobbed ti-bluetooth.patch.