Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc4.git2.1.vanilla.knurd.1.fc29

4 files changed, 70 insertions, 3 deletions

diff --git a/0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch b/0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch
new file mode 100644
index 000000000..1ba1dd19f
--- /dev/null
+++ b/0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch
@@ -0,0 +1,54 @@
+From 4cf95d8ea33f6b4704229e64f8a215bc44bf2403 Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Mon, 9 Jul 2018 12:55:30 -0700
+Subject: [PATCH] Revert "arm64: Use aarch64elf and aarch64elfb emulation mode
+ variants"
+To: Will Deacon <will.deacon@arm.com>
+To: Paul Kocialkowski <contact@paulk.fr>
+To: Catalin Marinas <catalin.marinas@arm.com>
+Cc: linux-arm-kernel@lists.infradead.org
+Cc: linux-kernel@vger.kernel.org
+
+This reverts commit 38fc4248677552ce35efc09902fdcb06b61d7ef9.
+
+This breaks compilation with Fedora gcc-8 tool chains:
+
+  CHK     include/generated/compile.h
+  LD [M]  arch/arm64/crypto/sha512-ce.o
+aarch64-linux-gnu-ld: cannot open linker script file ldscripts/aarch64elf.xr: No such file or directory
+make[1]: *** [scripts/Makefile.build:530: arch/arm64/crypto/sha512-ce.o] Error 1
+make: *** [Makefile:1029: arch/arm64/crypto] Error 2
+
+Fixes: 38fc42486775 ("arm64: Use aarch64elf and aarch64elfb emulation mode variants")
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+A bit rushed and I'm still debugging but I wanted to send this out
+before anyone else gets hit since it is -rc4. Seeing this on both native
+and cross compiles.
+---
+ arch/arm64/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
+index 7976d2d242fa..f476d52ad8d6 100644
+--- a/arch/arm64/Makefile
++++ b/arch/arm64/Makefile
+@@ -60,13 +60,13 @@ ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
+ KBUILD_CPPFLAGS	+= -mbig-endian
+ CHECKFLAGS	+= -D__AARCH64EB__
+ AS		+= -EB
+-LDFLAGS		+= -EB -maarch64elfb
++LDFLAGS		+= -EB -maarch64linuxb
+ UTS_MACHINE	:= aarch64_be
+ else
+ KBUILD_CPPFLAGS	+= -mlittle-endian
+ CHECKFLAGS	+= -D__AARCH64EL__
+ AS		+= -EL
+-LDFLAGS		+= -EL -maarch64elf
++LDFLAGS		+= -EL -maarch64linux
+ UTS_MACHINE	:= aarch64
+ endif
+ 
+-- 
+2.17.1
+
diff --git a/gitrev b/gitrev
index 8b879ed07..3700e320f 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-c42c12a905454734bbddaa9ca62413b4d493234e
+1e09177acae32a61586af26d83ca5ef591cdcaf5
diff --git a/kernel.spec b/kernel.spec
index 8a9c594da..bca57097e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -624,6 +624,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 # rhbz 1470995
 Patch504: kexec-bzimage-verify-pe-signature-fix.patch
 
+# arm64 compile fix
+Patch505: 0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1862,6 +1865,15 @@ fi
 #
 #
 %changelog
+* Wed Jul 11 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git2.1
+- Linux v4.18-rc4-17-g1e09177acae3
+
+* Tue Jul 10 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git1.1
+- Linux v4.18-rc4-7-g092150a25cb7
+
+* Tue Jul 10 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
 * Mon Jul 09 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git0.1
 - Linux v4.18-rc4
 
diff --git a/sources b/sources
index 617fd9ca8..bae2daa6a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 SHA512 (patch-4.18-rc4.xz) = 6d2b502a0a183b3612d3fe64d7836d12087db18cb7446842b777b4e936c60da58faa22830668b1af2acb903ccbf5577bb7b337127c6d6b7778f51c4aa3296c08
+SHA512 (patch-4.18-rc4-git2.xz) = 9ec19398912e349526d1782c37f6ec8450ff9dd35c0e353c88701c9ce011d9cede67d238ceece529c75b6b96e2c893477c3f146f15780f55dd2262cd8d4a8282