Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc5.git1.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc5.git1.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc5.git1.1.vanilla.knurd.1.fc27

7 files changed, 99 insertions, 152 deletions

diff --git a/0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch b/0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch
deleted file mode 100644
index 1ba1dd19f..000000000
--- a/0001-Revert-arm64-Use-aarch64elf-and-aarch64elfb-emulatio.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/0001-tools-build-Fixup-host-c-flags.patch b/0001-tools-build-Fixup-host-c-flags.patch
deleted file mode 100644
index 2a99f1079..000000000
--- a/0001-tools-build-Fixup-host-c-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b8c8dc142ff2f7f46060ed77b2de05c813233029 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Fri, 6 Jul 2018 17:11:31 -0700
-Subject: [PATCHv2 1/7] tools: build: Fixup host c flags
-To: Masahiro Yamada <yamada.masahiro@socionext.com>
-To: Josh Poimboeuf <jpoimboe@redhat.com>
-To: Jiri Olsa <jolsa@kernel.org>
-Cc: linux-kbuild@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: Robin Jarry <robin.jarry@6wind.com>
-
-Commit 0c3b7e42616f ("tools build: Add support for host programs format")
-introduced host_c_flags which referenced CHOSTFLAGS. The actual name of the
-variable is HOSTCFLAGS. Fix this up.
-
-Fixes: 0c3b7e42616f ("tools build: Add support for host programs format")
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
-v2: Also fixed another instance in perf pmu-events.
----
- tools/build/Build.include   | 2 +-
- tools/perf/pmu-events/Build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/build/Build.include b/tools/build/Build.include
-index a4bbb984941d..b5c679cd441c 100644
---- a/tools/build/Build.include
-+++ b/tools/build/Build.include
-@@ -98,4 +98,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXX
- ###
- ## HOSTCC C flags
- 
--host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
-+host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj))
-diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
-index 17783913d330..215ba30b8534 100644
---- a/tools/perf/pmu-events/Build
-+++ b/tools/perf/pmu-events/Build
-@@ -1,7 +1,7 @@
- hostprogs := jevents
- 
- jevents-y	+= json.o jsmn.o jevents.o
--CHOSTFLAGS_jevents.o	= -I$(srctree)/tools/include
-+HOSTCFLAGS_jevents.o	= -I$(srctree)/tools/include
- pmu-events-y	+= pmu-events.o
- JDIR		=  pmu-events/arch/$(SRCARCH)
- JSON		=  $(shell [ -d $(JDIR) ] &&				\
--- 
-2.17.1
-
diff --git a/0002-tools-build-Use-HOSTLDFLAGS-with-fixdep.patch b/0002-tools-build-Use-HOSTLDFLAGS-with-fixdep.patch
deleted file mode 100644
index 54da90963..000000000
--- a/0002-tools-build-Use-HOSTLDFLAGS-with-fixdep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b89f16785c9b5176c0af9b15eee74048daf95357 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Fri, 6 Jul 2018 17:42:05 -0700
-Subject: [PATCHv2 2/7] tools: build: Use HOSTLDFLAGS with fixdep
-To: Masahiro Yamada <yamada.masahiro@socionext.com>
-To: Josh Poimboeuf <jpoimboe@redhat.com>
-To: Jiri Olsa <jolsa@kernel.org>
-Cc: linux-kbuild@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Cc: Robin Jarry <robin.jarry@6wind.com>
-
-The final link of fixdep uses LDFLAGS but not the existing HOSTLDFLAGS.
-Fix this.
-
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
-v2: Switch to just using HOSTLDFLAGS instead of both LDFLAGS and
-HOSTLDFLAGS.
----
- tools/build/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/build/Makefile b/tools/build/Makefile
-index 5eb4b5ad79cb..5edf65e684ab 100644
---- a/tools/build/Makefile
-+++ b/tools/build/Makefile
-@@ -43,7 +43,7 @@ $(OUTPUT)fixdep-in.o: FORCE
- 	$(Q)$(MAKE) $(build)=fixdep
- 
- $(OUTPUT)fixdep: $(OUTPUT)fixdep-in.o
--	$(QUIET_LINK)$(HOSTCC) $(LDFLAGS) -o $@ $<
-+	$(QUIET_LINK)$(HOSTCC) $(HOSTLDFLAGS) -o $@ $<
- 
- FORCE:
- 
--- 
-2.17.1
-
diff --git a/aio-don-t-expose-__aio_sigset-in-uapi.patch b/aio-don-t-expose-__aio_sigset-in-uapi.patch
new file mode 100644
index 000000000..606a7d391
--- /dev/null
+++ b/aio-don-t-expose-__aio_sigset-in-uapi.patch
@@ -0,0 +1,79 @@
+From patchwork Wed Jul 11 13:48:46 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: aio: don't expose __aio_sigset in uapi
+From: Christoph Hellwig <hch@lst.de>
+X-Patchwork-Id: 10519793
+Message-Id: <20180711134846.18944-1-hch@lst.de>
+To: viro@zeniv.linux.org.uk
+Cc: linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
+ adrian@lisas.de, smueller@chronox.de, avagin@virtuozzo.com
+Date: Wed, 11 Jul 2018 15:48:46 +0200
+
+glibc uses a different defintion of sigset_t than the kernel does,
+and the current version would pull in both.  To fix this just do not
+expose the type at all - this somewhat mirrors pselect() where we
+do not even have a type for the magic sigmask argument, but just
+use pointer arithmetics.
+
+Fixes: 7a074e96 ("aio: implement io_pgetevents")
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reported-by: Adrian Reber <adrian@lisas.de>
+---
+ fs/aio.c                     | 5 +++++
+ include/linux/syscalls.h     | 1 +
+ include/uapi/linux/aio_abi.h | 6 ------
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/fs/aio.c b/fs/aio.c
+index 210df9da1283..27454594e37a 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -1896,6 +1896,11 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
+ 	return ret;
+ }
+ 
++struct __aio_sigset {
++	const sigset_t __user	*sigmask;
++	size_t		sigsetsize;
++};
++
+ SYSCALL_DEFINE6(io_pgetevents,
+ 		aio_context_t, ctx_id,
+ 		long, min_nr,
+diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
+index a368a68cb667..5c1a0933768e 100644
+--- a/include/linux/syscalls.h
++++ b/include/linux/syscalls.h
+@@ -11,6 +11,7 @@
+ #ifndef _LINUX_SYSCALLS_H
+ #define _LINUX_SYSCALLS_H
+ 
++struct __aio_sigset;
+ struct epoll_event;
+ struct iattr;
+ struct inode;
+diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h
+index 3c5038b587ba..d4593a6062ef 100644
+--- a/include/uapi/linux/aio_abi.h
++++ b/include/uapi/linux/aio_abi.h
+@@ -29,7 +29,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/fs.h>
+-#include <linux/signal.h>
+ #include <asm/byteorder.h>
+ 
+ typedef __kernel_ulong_t aio_context_t;
+@@ -110,10 +109,5 @@ struct iocb {
+ #undef IFBIG
+ #undef IFLITTLE
+ 
+-struct __aio_sigset {
+-	const sigset_t __user	*sigmask;
+-	size_t		sigsetsize;
+-};
+-
+ #endif /* __LINUX__AIO_ABI_H */
+ 
diff --git a/gitrev b/gitrev
index 79354a800..51be05a08 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-63f04777162181798399a2c4e5436d0d0c16291b
+30b06abfb92bfd5f9b63ea6a2ffb0bd905d1a6da
diff --git a/kernel.spec b/kernel.spec
index 5aefcc377..f672acd30 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 4
+%global rcrev 5
 # The git snapshot level
-%define gitrev 4
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -624,23 +624,20 @@ 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
-
 # Support for unique build ids
 # All queued in the kbuild tree
 Patch506: 0001-kbuild-Add-build-salt-to-the-kernel-and-modules.patch
 Patch507: 0002-x86-Add-build-salt-to-the-vDSO.patch
 Patch508: 0003-powerpc-Add-build-salt-to-the-vDSO.patch
 Patch509: 0004-arm64-Add-build-salt-to-the-vDSO.patch
-Patch510: 0001-tools-build-Fixup-host-c-flags.patch
-Patch511: 0002-tools-build-Use-HOSTLDFLAGS-with-fixdep.patch
 Patch512: 0003-treewide-Rename-HOSTCFLAGS-KBUILD_HOSTCFLAGS.patch
 Patch513: 0004-treewide-Rename-HOSTCXXFLAGS-to-KBUILD_HOSTCXXFLAGS.patch
 Patch514: 0005-treewide-Rename-HOSTLDFLAGS-to-KBUILD_HOSTLDFLAGS.patch
 Patch515: 0006-treewide-Rename-HOST_LOADLIBES-to-KBUILD_HOSTLDLIBS.patch
 Patch516: 0007-Kbuild-Use-HOST-FLAGS-options-from-the-command-line.patch
 
+# rhbz 1601529
+Patch517: aio-don-t-expose-__aio_sigset-in-uapi.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1898,6 +1895,19 @@ fi
 #
 #
 %changelog
+* Tue Jul 17 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git1.1
+- Linux v4.18-rc5-36-g30b06abfb92b
+- Fix aio uapi breakage (rhbz 1601529)
+
+* Tue Jul 17 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Jul 16 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git0.1
+- Linux v4.18-rc5
+
+* Mon Jul 16 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
 * Fri Jul 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git4.1
 - Linux v4.18-rc4-71-g63f047771621
 
diff --git a/sources b/sources
index ab75a2b5f..eaee70e2b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
-SHA512 (patch-4.18-rc4.xz) = 6d2b502a0a183b3612d3fe64d7836d12087db18cb7446842b777b4e936c60da58faa22830668b1af2acb903ccbf5577bb7b337127c6d6b7778f51c4aa3296c08
-SHA512 (patch-4.18-rc4-git4.xz) = 55ff71cb2235da5cd5b85045e90776343a1e717b1ba6090d49d5399bb1643476a536bd5a737c1c54e42a2d21eb24f4aa6d8acc6a47c6671fdf4334aa3216d492
+SHA512 (patch-4.18-rc5.xz) = 238685483f0eb95d95678dd4ddd83c044d3888bd4ccc6966c6f9e8209a21aea86c18ba4a8e10c9e0d78037bc4809a93196f44ee23e8f9463641a16ca1ea97574
+SHA512 (patch-4.18-rc5-git1.xz) = 297613110fb87dbb42363fdd961dd8e42214a55ed74bfd7b13c970a3a69ff509ea6cc836845c4bfbb1005c00adcad5adc58f9190d622046309e7007ea57f0846