merge masterkernel-4.17.0-0.rc5.git0.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc5.git0.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc5.git0.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc5.git0.1.vanilla.knurd.1.fc26

5 files changed, 57 insertions, 27 deletions

diff --git a/gitrev b/gitrev
index 80fa59bc2..d97c1acb8 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-41e3e1082367221e99a59c8968a583706123ae04
+67b8d5c7081221efa252e111cd52532ec6d4266f
diff --git a/kernel.spec b/kernel.spec
index bcf465711..c8f6f9bd6 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 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -103,8 +103,6 @@ Summary: The Linux kernel
 %define with_cross_headers   %{?_without_cross_headers:   0} %{?!_without_cross_headers:   1}
 # kernel-debuginfo
 %define with_debuginfo %{?_with_debuginfo:    1} %{?!_with_debuginfo:    0}
-# kernel-bootwrapper (for creating zImages from kernel + initrd)
-%define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
 #
@@ -189,7 +187,6 @@ Summary: The Linux kernel
 %endif
 
 %if %{nopatches}
-%define with_bootwrapper 0
 #define variant -vanilla
 %endif
 
@@ -254,10 +251,8 @@ Summary: The Linux kernel
 %define all_arch_configs kernel-%{version}-*.config
 %endif
 
-# bootwrapper is only on ppc
 # sparse blows up on ppc
 %ifnarch %{power64}
-%define with_bootwrapper 0
 %define with_sparse 0
 %endif
 
@@ -704,13 +699,6 @@ building most standard programs and are also needed for rebuilding the
 cross-glibc package.
 
 
-%package bootwrapper
-Summary: Boot wrapper files for generating combined kernel + initrd images
-Requires: gzip binutils
-%description bootwrapper
-Kernel-bootwrapper contains the wrapper code which makes bootable "zImage"
-files combining both kernel and initial ramdisk.
-
 %package debuginfo-common-%{_target_cpu}
 Summary: Kernel source files used by %{name}-debuginfo packages
 Provides: installonlypkg(kernel)
@@ -818,6 +806,9 @@ The meta-package for the %{1} kernel\
 Summary: %{variant_summary}\
 Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
+%ifarch %{power64}\
+Obsoletes: kernel-bootwrapper\
+%endif\
 %{expand:%%kernel_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
 %{expand:%%kernel_meta_package %{?1:%{1}}}\
@@ -1697,10 +1688,6 @@ done
 rm -rf $RPM_BUILD_ROOT/usr/tmp-headers
 %endif
 
-%if %{with_bootwrapper}
-make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
-%endif
-
 ###
 ### clean
 ###
@@ -1823,12 +1810,6 @@ fi
 /usr/*-linux-gnu/include/*
 %endif
 
-%if %{with_bootwrapper}
-%files bootwrapper
-/usr/sbin/*
-%{_libdir}/kernel-wrapper
-%endif
-
 # empty meta-package
 %files
 # This is %%{image_install_path} on an arch where that includes ELF files,
@@ -1896,6 +1877,12 @@ fi
 #
 #
 %changelog
+* Mon May 14 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git0.1
+- Linux v4.17-rc5
+
+* Mon May 14 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
 * Fri May 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git4.1
 - Linux v4.17-rc4-96-g41e3e1082367
 
diff --git a/rebase-notes.txt b/rebase-notes.txt
index c7d620a27..27c0aeb92 100644
--- a/rebase-notes.txt
+++ b/rebase-notes.txt
@@ -1,5 +1,6 @@
 Linux 4.17 rebase notes:
 - Turn off MTD + JFFS2 + extra infiniband options
+- Back out kernel-bootwrapper changes for power commit f360f7278a753796aec58ade5b149d12e49f8bc1
 
 Linux 4.16 rebase notes:
 - Consider turning off all the IMA features?
diff --git a/sources b/sources
index cb329bbbc..114aaf836 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
-SHA512 (patch-4.17-rc4.xz) = 110990b1cc0ccb500075acec043810434a33beb23c1e020a9c8034e11af1e61d35273a6c3cb80d4f3ae8bb9da3f3909bff3b89c80af13219baf96f70a45513c8
-SHA512 (patch-4.17-rc4-git4.xz) = 09b16276469ae1afe67a1c45118baf8a71d7f4dfae9eff783373a8dcd27b1dbf3a64fe18c1e6f2b3e5734a6958f476e31f31136341b5c6bee93f1efcc3c92d42
+SHA512 (patch-4.17-rc5.xz) = 00599599b13efa89ac7d2f33a5b4eb09c4226add9944ae10cc08fa8c98d08a9a7a58e234bbafd4ccfe00cc808979ce98018d9fc1cf8245ad74574233cffb9883
diff --git a/tests/README.txt b/tests/README.txt
new file mode 100644
index 000000000..27bfae5cd
--- /dev/null
+++ b/tests/README.txt
@@ -0,0 +1,43 @@
+Recommended Layout for Kernel Tests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add tests to enable Fedora CI [1] which are curated using the standard test interface [2]
+
+[1] https://fedoraproject.org/wiki/CI
+[2] https://fedoraproject.org/wiki/CI/Standard_Test_Interface
+
+As new pull requests are filed, please link/add your tests in one of the following directories
+to better organize the tests. If a new directory is required, which isn't included in the layout
+below, please add justification in the pull request. The directories can be created as new tests
+are added to dist-git.
+
+acpi
+cgroup
+cpu
+crc32c-self-check
+criu
+crypto
+drivers
+filesystem
+firmware
+ftrace
+include
+kabi
+kmod
+kpatch
+ksc
+kvm
+mce
+memory
+modules
+namespace
+networking
+performance
+powermgmt
+ptp
+scheduler
+security
+storage
+syscalls
+time
+update build