Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-13 12:01:56 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-13 12:01:56 +0200
commitbd43b8672c3425a726b0d819691def9b9089fa77 (patch)
tree536558691d6e40699e1f1d9a46f0c718f00ae95d
parentbb74534427b0c2ff94cdb9b6ecccfcef314dc8fc (diff)
Automatically updated to 5.2-7765-g964a4eacef67
-rw-r--r--config/arm64/vanilla11
-rw-r--r--config/armv7hl/vanilla10
-rw-r--r--config/i386/vanilla13
-rw-r--r--config/ppc64/vanilla12
-rw-r--r--config/ppc64le/vanilla12
-rw-r--r--config/x86_64/vanilla12
-rw-r--r--patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch36
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
9 files changed, 65 insertions, 44 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 775a566430..dca779bb54 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
# CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED is not set
@@ -22,6 +23,9 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+CONFIG_HEADER_TEST=y
+CONFIG_KERNEL_HEADER_TEST=y
+CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-vanilla"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -258,7 +262,6 @@ CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ZONE_DMA32=y
-CONFIG_HAVE_GENERIC_GUP=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_SMP=y
CONFIG_KERNEL_MODE_NEON=y
@@ -953,6 +956,7 @@ CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
CONFIG_ARCH_KEEP_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
@@ -2133,9 +2137,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -9993,6 +9999,8 @@ CONFIG_LSM="integrity,apparmor"
#
# CONFIG_CC_HAS_AUTO_VAR_INIT is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@@ -10419,6 +10427,7 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_INSTALL=y
CONFIG_HEADERS_CHECK=y
# CONFIG_OPTIMIZE_INLINING is not set
CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index eec5ae2a2f..e2f199f2fb 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
# CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED is not set
@@ -21,6 +22,9 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+CONFIG_HEADER_TEST=y
+CONFIG_KERNEL_HEADER_TEST=y
+CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-vanilla"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -678,7 +682,6 @@ CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
CONFIG_HAVE_ARCH_PFN_VALID=y
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
@@ -2209,9 +2212,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -10261,6 +10266,8 @@ CONFIG_LSM="integrity,apparmor"
#
# CONFIG_CC_HAS_AUTO_VAR_INIT is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@@ -10660,6 +10667,7 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_INSTALL=y
CONFIG_HEADERS_CHECK=y
# CONFIG_OPTIMIZE_INLINING is not set
CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 230afb9de5..e95de3c226 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
# CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED is not set
@@ -22,6 +23,9 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+CONFIG_HEADER_TEST=y
+CONFIG_KERNEL_HEADER_TEST=y
+CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-vanilla"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -676,7 +680,6 @@ CONFIG_COMPAT_32=y
# end of Binary Emulations
CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_GENERIC_GUP=y
#
# Firmware Drivers
@@ -733,6 +736,7 @@ CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_KVM_VFIO=y
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -960,6 +964,7 @@ CONFIG_NEED_MULTIPLE_NODES=y
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
CONFIG_MEMORY_ISOLATION=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -998,6 +1003,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_FRAME_VECTOR=y
# CONFIG_PERCPU_STATS is not set
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GUP_GET_PTE_LOW_HIGH=y
CONFIG_ARCH_HAS_PTE_SPECIAL=y
# end of Memory Management options
@@ -2097,9 +2103,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -9144,6 +9152,8 @@ CONFIG_LSM="integrity,apparmor"
#
# CONFIG_CC_HAS_AUTO_VAR_INIT is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@@ -9529,6 +9539,7 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_INSTALL=y
CONFIG_HEADERS_CHECK=y
CONFIG_OPTIMIZE_INLINING=y
CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 0661fe1c2e..44ea0f2df4 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
# CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED is not set
@@ -22,6 +23,9 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+CONFIG_HEADER_TEST=y
+CONFIG_KERNEL_HEADER_TEST=y
+CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-vanilla"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -786,7 +790,7 @@ CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
CONFIG_ARCH_KEEP_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_HAVE_BOOTMEM_INFO_NODE=y
@@ -843,6 +847,7 @@ CONFIG_ARCH_HAS_PKEYS=y
# CONFIG_PERCPU_STATS is not set
# CONFIG_GUP_BENCHMARK is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
# end of Memory Management options
CONFIG_NET=y
@@ -1802,9 +1807,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -7205,6 +7212,8 @@ CONFIG_LSM="integrity,apparmor"
#
# CONFIG_CC_HAS_AUTO_VAR_INIT is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@@ -7574,6 +7583,7 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_INSTALL=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_OPTIMIZE_INLINING=y
CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 86f88ed332..24fbc92588 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
# CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED is not set
@@ -22,6 +23,9 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+CONFIG_HEADER_TEST=y
+CONFIG_KERNEL_HEADER_TEST=y
+CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-vanilla"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -723,7 +727,7 @@ CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
CONFIG_ARCH_KEEP_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_HAVE_BOOTMEM_INFO_NODE=y
@@ -780,6 +784,7 @@ CONFIG_ARCH_HAS_PKEYS=y
# CONFIG_PERCPU_STATS is not set
# CONFIG_GUP_BENCHMARK is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
# end of Memory Management options
CONFIG_NET=y
@@ -1701,9 +1706,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -7056,6 +7063,8 @@ CONFIG_LSM="integrity,apparmor"
#
# CONFIG_CC_HAS_AUTO_VAR_INIT is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@@ -7425,6 +7434,7 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_INSTALL=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_OPTIMIZE_INLINING=y
CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 6e738511ae..e5160b7d46 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
# CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED is not set
@@ -22,6 +23,9 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+CONFIG_HEADER_TEST=y
+CONFIG_KERNEL_HEADER_TEST=y
+CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-vanilla"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -657,7 +661,6 @@ CONFIG_SYSVIPC_COMPAT=y
# end of Binary Emulations
CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_HAVE_GENERIC_GUP=y
#
# Firmware Drivers
@@ -715,6 +718,7 @@ CONFIG_KVM_VFIO=y
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
CONFIG_KVM_COMPAT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -957,6 +961,7 @@ CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_HAVE_BOOTMEM_INFO_NODE=y
CONFIG_MEMORY_HOTPLUG=y
@@ -2100,9 +2105,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# Firmware loader
#
CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
# end of Firmware loader
CONFIG_WANT_DEV_COREDUMP=y
@@ -8912,6 +8919,8 @@ CONFIG_LSM="integrity,apparmor"
#
# CONFIG_CC_HAS_AUTO_VAR_INIT is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@@ -9328,6 +9337,7 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_INSTALL=y
CONFIG_HEADERS_CHECK=y
CONFIG_OPTIMIZE_INLINING=y
CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch b/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
deleted file mode 100644
index 508481f2f2..0000000000
--- a/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 60f1d000300603afcd18ed4a27a4a4af374d867a Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Wed, 27 Feb 2019 13:11:22 +0100
-Subject: [PATCH] BPF: UMH: do not detect if compiler can link userspace
- program.
-
-References: boo#1127188
-Patch-mainline: no, SUSE specific
-
-SUSE crosscompilers cannot build userspace programs. They do not include
-libc and related headers.
-
-The configuration files are updated using such crosscompilers leading to
-this UMH symbol flipping and build kernel build failures due to
-configuration differences.
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
----
- net/bpfilter/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
-index e558b46596c4..2e9b6a8692ea 100644
---- a/net/bpfilter/Kconfig
-+++ b/net/bpfilter/Kconfig
-@@ -8,7 +8,6 @@ menuconfig BPFILTER
- if BPFILTER
- config BPFILTER_UMH
- tristate "bpfilter kernel module with user mode helper"
-- depends on $(success,$(srctree)/scripts/cc-can-link.sh $(CC))
- default m
- help
- This builds bpfilter kernel module with embedded user mode helper
---
-2.20.1
-
diff --git a/rpm/config.sh b/rpm/config.sh
index de9c9e25cf..2bcce2be49 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.2-7109-gd7d170a8e357
+SRCVERSION=5.2-7765-g964a4eacef67
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all
diff --git a/series.conf b/series.conf
index c77dce093f..c7dc531933 100644
--- a/series.conf
+++ b/series.conf
@@ -35,7 +35,6 @@
########################################################
patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
patches.rpmify/Add-ksym-provides-tool.patch
- patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
########################################################
#