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

14 files changed, 67 insertions, 15 deletions

diff --git a/0001-kconfig-loop-boundary-condition-fix.patch b/0001-kconfig-loop-boundary-condition-fix.patch
new file mode 100644
index 000000000..71c7f1d36
--- /dev/null
+++ b/0001-kconfig-loop-boundary-condition-fix.patch
@@ -0,0 +1,35 @@
+From fbeaf6c71be2273fde980395974e70eb8e1f4a80 Mon Sep 17 00:00:00 2001
+From: Jerry James <loganjerry@gmail.com>
+Date: Sat, 23 Jun 2018 22:49:04 +0200
+Subject: [PATCH] kconfig: loop boundary condition fix
+
+If buf[-1] just happens to hold the byte 0x0A, then nread can wrap around
+to (size_t)-1, leading to invalid memory accesses.
+
+This has caused segmentation faults when trying to build the latest
+kernel snapshots for i686 in Fedora:
+https://bugzilla.redhat.com/show_bug.cgi?id=1592374
+
+Signed-off-by: Jerry James <loganjerry@gmail.com>
+[alexpl@fedoraproject.org: reformatted patch for submission]
+Signed-off-by: Alexander Ploumistos <alexpl@fedoraproject.org>
+---
+ scripts/kconfig/preprocess.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
+index 65da87fce907..5ca2df790d3c 100644
+--- a/scripts/kconfig/preprocess.c
++++ b/scripts/kconfig/preprocess.c
+@@ -156,7 +156,7 @@ static char *do_shell(int argc, char *argv[])
+ 		nread--;
+ 
+ 	/* remove trailing new lines */
+-	while (buf[nread - 1] == '\n')
++	while (nread > 0 && buf[nread - 1] == '\n')
+ 		nread--;
+ 
+ 	buf[nread] = 0;
+-- 
+2.17.1
+
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE b/configs/fedora/generic/arm/CONFIG_CMDLINE
index f3083e1e5..f3083e1e5 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE
+++ b/configs/fedora/generic/arm/CONFIG_CMDLINE
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE b/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE
index db59f3770..db59f3770 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE
+++ b/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE b/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE
deleted file mode 100644
index f218410dc..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMDLINE="console=ttyAMA0"
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT
new file mode 100644
index 000000000..7905dce5c
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT
@@ -0,0 +1 @@
+# CONFIG_BPF_JIT is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON
new file mode 100644
index 000000000..faae023d4
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON
@@ -0,0 +1 @@
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index af7c0cf9b..8a6bf510a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -948,7 +948,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
-CONFIG_CMDLINE="console=ttyAMA0"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 20f01a4ae..4f87ebc5f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -948,7 +948,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
-CONFIG_CMDLINE="console=ttyAMA0"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5870c84d6..df75608e2 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -686,8 +686,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -989,6 +989,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 20e995be1..e736900dd 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -661,8 +661,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -959,6 +959,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8b97b5846..30bef0eb2 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -660,8 +660,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -958,6 +958,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d1ce647c6..095368002 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -685,8 +685,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -988,6 +988,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel.spec b/kernel.spec
index 6a7d71149..6e95c5b87 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 1
+%global rcrev 2
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -622,6 +622,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 # rhbz 1470995
 Patch504: kexec-bzimage-verify-pe-signature-fix.patch
 
+# i686 fix
+Patch505: 0001-kconfig-loop-boundary-condition-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1860,6 +1863,16 @@ fi
 #
 #
 %changelog
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git0.1
+- Linux v4.18-rc2
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Mon Jun 25 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable BFP JIT on ARMv7 as it's currently broken
+- Remove forced console on aarch64, legacy config (rhbz 1594402)
+
 * Fri Jun 22 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git4.1
 - Linux v4.18-rc1-189-g894b8c000ae6
 
diff --git a/sources b/sources
index 557ec7f66..906d0189f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
-SHA512 (patch-4.18-rc1.xz) = ead128244b67261c538b6e183eae2c8a33de3a335f6d3fee677e3c30c2345df13732140335060038537320c39716dca0ce2a7e379b30db827c8d7ea6c2fff6e3
-SHA512 (patch-4.18-rc1-git4.xz) = c6cfd9a142e0ea3a77ca4428064593a2a5dd2871443fdbfce6ad349ac525af16e4172c6937d7b2c799171bfaf1654cfa720601add3f322fc49b319dd80a2a65f
+SHA512 (patch-4.18-rc2.xz) = d9723a202e43f3e68895fc8463e15b0723f6ecff947805ca501fdf12aa74e87915bc42d1c021d14168814c2178574f3f6f0c2bd770af9653c9e0867ebfaaebe0