From 2147ca93975deaf220619e9096e0b84d879febc9 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 11 Nov 2019 09:39:05 -0500 Subject: Enable VBOXSF_FS for x86 This is a staging driver that implements the Linux-guest side of folder sharing. --- configs/fedora/generic/CONFIG_VBOXSF_FS | 1 + configs/fedora/generic/x86/CONFIG_VBOXSF_FS | 1 + kernel-aarch64-debug.config | 1 + kernel-aarch64.config | 1 + kernel-armv7hl-debug.config | 1 + kernel-armv7hl-lpae-debug.config | 1 + kernel-armv7hl-lpae.config | 1 + kernel-armv7hl.config | 1 + kernel-i686-debug.config | 1 + kernel-i686.config | 1 + kernel-ppc64le-debug.config | 1 + kernel-ppc64le.config | 1 + kernel-s390x-debug.config | 1 + kernel-s390x.config | 1 + kernel-x86_64-debug.config | 1 + kernel-x86_64.config | 1 + 16 files changed, 16 insertions(+) create mode 100644 configs/fedora/generic/CONFIG_VBOXSF_FS create mode 100644 configs/fedora/generic/x86/CONFIG_VBOXSF_FS diff --git a/configs/fedora/generic/CONFIG_VBOXSF_FS b/configs/fedora/generic/CONFIG_VBOXSF_FS new file mode 100644 index 000000000..7fb11ee4b --- /dev/null +++ b/configs/fedora/generic/CONFIG_VBOXSF_FS @@ -0,0 +1 @@ +# CONFIG_VBOXSF_FS is not set diff --git a/configs/fedora/generic/x86/CONFIG_VBOXSF_FS b/configs/fedora/generic/x86/CONFIG_VBOXSF_FS new file mode 100644 index 000000000..9a112e599 --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_VBOXSF_FS @@ -0,0 +1 @@ +CONFIG_VBOXSF_FS=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index d735470ae..dd6e344db 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -7013,6 +7013,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 104f99094..94cde7f9a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6991,6 +6991,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 0d6a11c76..b82dc04ed 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -7287,6 +7287,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VDSO is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index b7dfc4800..553636d03 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6933,6 +6933,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7177b848d..ea67ddec7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6912,6 +6912,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 68df342ff..d8b4686ae 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -7266,6 +7266,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VDSO is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d0c673c71..3020a7e4e 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6329,6 +6329,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m +CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 242861c29..719bf2ab5 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6308,6 +6308,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m +CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 459d8630b..0cf92f6bf 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5959,6 +5959,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 13d8d9d1c..cee65c12a 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5936,6 +5936,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 9a2501c95..eddee89bb 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5896,6 +5896,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 237b2a434..ec70e8384 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5873,6 +5873,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y +# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 78e443a4c..f4774fc05 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6385,6 +6385,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m +CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index b5267ba41..3c7a7c244 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6364,6 +6364,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m +CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set -- cgit From a86513b40ec92203cf73c27feed0f4045db15634 Mon Sep 17 00:00:00 2001 From: David Ward Date: Mon, 11 Nov 2019 14:06:01 -0500 Subject: Revert "Trim EXTRAVERSION in the Makefile on CI builds" This reverts commit 89c7d2ae30a43ba2960ce14cddd50f8d8a7da92f, which was causing kernel modules to be installed in a location other than /lib/modules/$(uname -r), preventing modprobe from locating them. CI builds no longer contain the Pagure UID in the package release: https://github.com/CentOS-PaaS-SIG/upstream-fedora-pipeline/pull/199 --- kernel.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel.spec b/kernel.spec index 5d4f938fe..14e349b10 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1427,9 +1427,7 @@ BuildKernel() { %endif # make sure EXTRAVERSION says what we want it to say - # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters - ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r") - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile + perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flav}/" Makefile # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme %if !0%{?rcrev} -- cgit From bee04eadf8306be0349b9f75559a1fea80591d7f Mon Sep 17 00:00:00 2001 From: David Ward Date: Mon, 11 Nov 2019 14:06:01 -0500 Subject: Fix existing CI test for memfd_create() The test was failing (after hanging for several hours) because of a hard-coded assumption about which file descriptor would be returned by memfd_create(). The actual file descriptor gets printed by the test program though, so read this and use it instead. (Adjust the test program so that this is not printed until the file is ready.) Resolve compiler warnings about implicit function declarations, by using the #include statements listed in the kernel.org man-pages. --- tests/memory/memfd_create/runtest.sh | 7 ++++--- tests/memory/memfd_create/t_get_seals.c | 3 ++- tests/memory/memfd_create/t_memfd_create.c | 18 +++++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/memory/memfd_create/runtest.sh b/tests/memory/memfd_create/runtest.sh index 24dfeb5b6..880c3096e 100755 --- a/tests/memory/memfd_create/runtest.sh +++ b/tests/memory/memfd_create/runtest.sh @@ -38,11 +38,12 @@ fi function sanity_memfd_create() { - rlRun "./t_memfd_create memf 1024 gswS &" - rlRun "./t_get_seals /proc/$!/fd/3 > seals" + rlRun "coproc ./t_memfd_create memf 1024 gswS" + rlRun "read -u ${COPROC[0]} MEMFD_PATH" + rlRun "./t_get_seals $MEMFD_PATH > ./seals" rlRun "cat ./seals" rlAssertGrep "SEAL GROW WRITE SHRINK" ./seals - rlRun "pkill t_memfd_create" + rlRun "kill $COPROC_PID" } diff --git a/tests/memory/memfd_create/t_get_seals.c b/tests/memory/memfd_create/t_get_seals.c index 8babe34d2..1a2c900e0 100644 --- a/tests/memory/memfd_create/t_get_seals.c +++ b/tests/memory/memfd_create/t_get_seals.c @@ -16,8 +16,9 @@ * */ -#include +#define _GNU_SOURCE #include +#include #include #include #include diff --git a/tests/memory/memfd_create/t_memfd_create.c b/tests/memory/memfd_create/t_memfd_create.c index 73d641a6e..4250d7174 100644 --- a/tests/memory/memfd_create/t_memfd_create.c +++ b/tests/memory/memfd_create/t_memfd_create.c @@ -16,11 +16,12 @@ * */ -#include -#include +#define _GNU_SOURCE +#include +#include +#include #include #include -#include #include #include @@ -66,10 +67,6 @@ int main(int argc, char *argv[]) if (write(fd, message, strlen(message)) <= 0) errExit("write"); - //printf("PID: %ld; fd: %d; /proc/%ld/fd/%d\n", - // (long) getpid(), fd, (long) getpid(), fd); - printf("/proc/%ld/fd/%d\n", (long) getpid(), fd); - /* Code to map the file and populate the mapping with data omitted */ @@ -92,6 +89,13 @@ int main(int argc, char *argv[]) errExit("fcntl"); } + /* Output the pathname of (a symbolic link to) the file + created by memfd_create() */ + + printf("/proc/%ld/fd/%d\n", (long) getpid(), fd); + + fflush(stdout); + /* Keep running, so that the file created by memfd_create() continues to exist */ -- cgit From d753bc001a2a92bc325ccaca10497c7e2049f6ff Mon Sep 17 00:00:00 2001 From: David Ward Date: Mon, 11 Nov 2019 14:06:01 -0500 Subject: Resolve syntax warnings in SPEC file The "regular" definition of the with_kabichk macro does not need to be commented out while it is temporarily (re-)defined as 0 on the next line. This avoids a "Macro expanded in comment" warning. Remove comments on the same line as %endif directives. Instead, make a couple of these conditionals easier to read (and consistent with the surrounding ones) by deleting a few blank lines. --- kernel.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/kernel.spec b/kernel.spec index 14e349b10..672b35354 100644 --- a/kernel.spec +++ b/kernel.spec @@ -146,7 +146,7 @@ Summary: The Linux kernel # Only build the debug kernel (--with dbgonly): %define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0} # Control whether we perform a compat. check against published ABI. -#%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} +%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} # Temporarily disable kabi checks until RC. %define with_kabichk 0 # Control whether we perform a compat. check against DUP ABI. @@ -795,7 +795,6 @@ This package is required by %{name}-debuginfo subpackages. It provides the kernel source files common to all builds. %if %{with_selftests} - %package selftests-internal Summary: Kernel samples and selftests License: GPLv2 @@ -803,14 +802,13 @@ Requires: binutils, bpftool, iproute-tc, nmap-ncat Requires: kernel-modules-internal = %{version}-%{release} %description selftests-internal Kernel sample programs and selftests. - +%{nil} # Note that this pattern only works right to match the .build-id # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libexecdir}/(ksamples|kselftests)/.*|XXX' -o selftests-debuginfo.list} - -%endif # with_selftests +%endif %if %{with_gcov} %package gcov @@ -1000,7 +998,7 @@ Cortex-A15 devices with LPAE and HW virtualisation support %description zfcpdump-core The kernel package contains the Linux kernel (vmlinuz) for use by the zfcpdump infrastructure. -%endif # with_zfcpdump +%endif %define variant_summary The Linux kernel compiled with extra debugging enabled %kernel_variant_package debug @@ -1511,8 +1509,8 @@ BuildKernel() { %pesign -s -i $KernelImage -o vmlinuz.signed %else %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca} -c %{secureboot_key} -n %{pesign_name} - %endif # fedora - %endif # arches + %endif + %endif %ifarch s390x ppc64le if [ -x /usr/bin/rpm-sign ]; then rpm-sign --key "%{pesign_name}" --lkmsign $SignImage --output vmlinuz.signed @@ -2054,7 +2052,7 @@ docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion} mkdir -p $docdir tar -h -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir -%endif # with_doc +%endif # We have to do the headers install before the tools install because the # kernel headers_install will remove any header files in /usr/include that @@ -2096,10 +2094,9 @@ rm -rf $RPM_BUILD_ROOT/usr/tmp-headers # kabi directory INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/ mkdir -p $INSTALL_KABI_PATH - # install kabi releases directories tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH -%endif # with_kernel_abi_whitelists +%endif %if %{with_selftests} pushd samples -- cgit From 0bc3955b5d4971b182095fa9cfb5ca7856945dcb Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 13 Nov 2019 09:27:56 -0500 Subject: Revert "Enable VBOXSF_FS for x86" This reverts commit 2147ca93975deaf220619e9096e0b84d879febc9. Upstream removed the driver, hopefully it'll make it into 5.5. --- configs/fedora/generic/CONFIG_VBOXSF_FS | 1 - configs/fedora/generic/x86/CONFIG_VBOXSF_FS | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 16 files changed, 16 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_VBOXSF_FS delete mode 100644 configs/fedora/generic/x86/CONFIG_VBOXSF_FS diff --git a/configs/fedora/generic/CONFIG_VBOXSF_FS b/configs/fedora/generic/CONFIG_VBOXSF_FS deleted file mode 100644 index 7fb11ee4b..000000000 --- a/configs/fedora/generic/CONFIG_VBOXSF_FS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_VBOXSF_FS is not set diff --git a/configs/fedora/generic/x86/CONFIG_VBOXSF_FS b/configs/fedora/generic/x86/CONFIG_VBOXSF_FS deleted file mode 100644 index 9a112e599..000000000 --- a/configs/fedora/generic/x86/CONFIG_VBOXSF_FS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_VBOXSF_FS=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index dd6e344db..d735470ae 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -7013,7 +7013,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 94cde7f9a..104f99094 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6991,7 +6991,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index b82dc04ed..0d6a11c76 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -7287,7 +7287,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VDSO is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 553636d03..b7dfc4800 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6933,7 +6933,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ea67ddec7..7177b848d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6912,7 +6912,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index d8b4686ae..68df342ff 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -7266,7 +7266,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VDSO is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 3020a7e4e..d0c673c71 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6329,7 +6329,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 719bf2ab5..242861c29 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6308,7 +6308,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 0cf92f6bf..459d8630b 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5959,7 +5959,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index cee65c12a..13d8d9d1c 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5936,7 +5936,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index eddee89bb..9a2501c95 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5896,7 +5896,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index ec70e8384..237b2a434 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5873,7 +5873,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index f4774fc05..78e443a4c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6385,7 +6385,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 3c7a7c244..b5267ba41 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6364,7 +6364,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set -- cgit From 9eacdbe062be72a5383cea1f99241615692bc201 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 13 Nov 2019 09:30:03 -0500 Subject: Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index a44ac8ae0..d33cd1a64 100644 --- a/kernel.spec +++ b/kernel.spec @@ -187,7 +187,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 0%{?fedora} # Kernel headers are being split out into a separate package @@ -2408,6 +2408,9 @@ fi # # %changelog +* Wed Nov 13 2019 Jeremy Cline +- Reenable debugging options. + * Mon Nov 11 2019 Jeremy Cline - 5.4.0-0.rc7.git0.1 - Linux v5.4-rc7 -- cgit From 6f0f15962eb202999219edb2fd50efa8199d8bd2 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 13 Nov 2019 09:36:31 -0500 Subject: Linux v5.4-rc7-49-g0e3f1ad80fc8 --- configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO | 1 + configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF | 1 + configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON | 1 + gitrev | 2 +- kernel-i686-debug.config | 3 +++ kernel-i686.config | 3 +++ kernel-x86_64-debug.config | 3 +++ kernel-x86_64.config | 3 +++ kernel.spec | 5 ++++- sources | 1 + 10 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO create mode 100644 configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF create mode 100644 configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO new file mode 100644 index 000000000..788136fc5 --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO @@ -0,0 +1 @@ +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF new file mode 100644 index 000000000..d22a12f0d --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF @@ -0,0 +1 @@ +CONFIG_X86_INTEL_TSX_MODE_OFF=y diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON new file mode 100644 index 000000000..b6471915c --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON @@ -0,0 +1 @@ +# CONFIG_X86_INTEL_TSX_MODE_ON is not set diff --git a/gitrev b/gitrev index 571641e99..09cced593 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -847120f859cc45e074204f4cf33c8df069306eb2 +0e3f1ad80fc8cb0c517fd9a9afb22752b741fa76 diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d0c673c71..abbd6606b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6613,6 +6613,9 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set # CONFIG_X86_LONGHAUL is not set CONFIG_X86_LONGRUN=y diff --git a/kernel-i686.config b/kernel-i686.config index 242861c29..74ad25121 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6592,6 +6592,9 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set # CONFIG_X86_LONGHAUL is not set CONFIG_X86_LONGRUN=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 78e443a4c..4ff2b06d2 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6666,6 +6666,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_INJECT=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index b5267ba41..d03767fad 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6645,6 +6645,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_INJECT=m diff --git a/kernel.spec b/kernel.spec index d33cd1a64..e98a3eedc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -100,7 +100,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2408,6 +2408,9 @@ fi # # %changelog +* Wed Nov 13 2019 Jeremy Cline - 5.4.0-0.rc7.git1.1 +- Linux v5.4-rc7-49-g0e3f1ad80fc8 + * Wed Nov 13 2019 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index 3f293fcab..4459c08ae 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d SHA512 (patch-5.4-rc7.xz) = 0bd727332fc13d43f48497c7587ede034a1ca7df67bae3f6a7dab6001f0b75c858b15d4fa6c0ca5bf71bd467c330f14a92918e8bbc542c7c40f59d2a8f71eeb1 +SHA512 (patch-5.4-rc7-git1.xz) = e91441caa7f3cf03c4034faf45d9e4cd4dfc568e034409b437bfbcdd611481ac3e7624f86e8ccefbcda022bfc23d3a6c232cd766125abeed1f7aaa779221b60a -- cgit