Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-12-24 01:34:19 +0100
committerMichal Kubecek <mkubecek@suse.cz>2018-12-24 01:35:26 +0100
commitba5c149787552e5973eef617f3ddadbfcbc2da67 (patch)
treeef3496b6b2e8205e2238bdbba221e05fe705e908
parenteba2c31b80b33ae3c98567c0ffb6865a9645799b (diff)
Update to 4.20 final
- Eliminated 1 patch - Refresh configs
-rw-r--r--config/arm64/default2
-rw-r--r--config/armv6hl/default2
-rw-r--r--config/armv7hl/default2
-rw-r--r--config/armv7hl/lpae2
-rw-r--r--config/i386/pae2
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64le/default3
-rw-r--r--config/s390x/default3
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/default2
-rw-r--r--patches.rpmify/Add-ksym-provides-tool.patch4
-rw-r--r--patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch6
-rw-r--r--patches.suse/rtlwifi-Fix-leak-of-skb-when-processing-C2H_BT_INFO.patch40
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
15 files changed, 15 insertions, 61 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 11c094c232..5db170532d 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.20.0-rc7 Kernel Configuration
+# Linux/arm64 4.20.0 Kernel Configuration
#
#
diff --git a/config/armv6hl/default b/config/armv6hl/default
index 469107ac5a..821afa0d04 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.20.0-rc7 Kernel Configuration
+# Linux/arm 4.20.0 Kernel Configuration
#
#
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 7fc8b9afb8..6e363d379e 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.20.0-rc7 Kernel Configuration
+# Linux/arm 4.20.0 Kernel Configuration
#
#
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 51e267cab5..198447adee 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.20.0-rc7 Kernel Configuration
+# Linux/arm 4.20.0 Kernel Configuration
#
#
diff --git a/config/i386/pae b/config/i386/pae
index 6cdaa0b2b4..830f1ed50c 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.20.0-rc6 Kernel Configuration
+# Linux/i386 4.20.0 Kernel Configuration
#
#
diff --git a/config/ppc64/default b/config/ppc64/default
index 467f3cd3c1..5d2d8cfec4 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc6 Kernel Configuration
+# Linux/powerpc 4.20.0 Kernel Configuration
#
#
@@ -6570,7 +6570,6 @@ CONFIG_HFSPLUS_FS=m
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_JFFS2_FS is not set
-CONFIG_UBIFS_FS_AUTHENTICATION=y
CONFIG_CRAMFS=m
CONFIG_CRAMFS_BLOCKDEV=y
CONFIG_CRAMFS_MTD=y
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 05a5d66d5d..a84c0cfd8e 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc6 Kernel Configuration
+# Linux/powerpc 4.20.0 Kernel Configuration
#
#
@@ -6420,7 +6420,6 @@ CONFIG_HFSPLUS_FS=m
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_JFFS2_FS is not set
-CONFIG_UBIFS_FS_AUTHENTICATION=y
CONFIG_CRAMFS=m
CONFIG_CRAMFS_BLOCKDEV=y
CONFIG_CRAMFS_MTD=y
diff --git a/config/s390x/default b/config/s390x/default
index 8c9bb7be03..92ef031a7d 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc6 Kernel Configuration
+# Linux/s390 4.20.0 Kernel Configuration
#
#
@@ -2959,7 +2959,6 @@ CONFIG_HFSPLUS_FS=m
# CONFIG_BEFS_FS is not set
CONFIG_BFS_FS=m
# CONFIG_EFS_FS is not set
-CONFIG_UBIFS_FS_AUTHENTICATION=y
CONFIG_CRAMFS=m
CONFIG_CRAMFS_BLOCKDEV=y
CONFIG_SQUASHFS=m
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 59747696fa..3f56e3d2d7 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc6 Kernel Configuration
+# Linux/s390 4.20.0 Kernel Configuration
#
#
diff --git a/config/x86_64/default b/config/x86_64/default
index a79ae42e76..81c08e84db 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.20.0-rc6 Kernel Configuration
+# Linux/x86_64 4.20.0 Kernel Configuration
#
#
diff --git a/patches.rpmify/Add-ksym-provides-tool.patch b/patches.rpmify/Add-ksym-provides-tool.patch
index 170581a774..5eab797717 100644
--- a/patches.rpmify/Add-ksym-provides-tool.patch
+++ b/patches.rpmify/Add-ksym-provides-tool.patch
@@ -15,7 +15,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
-@@ -1,13 +1,17 @@
+@@ -1,11 +1,15 @@
# SPDX-License-Identifier: GPL-2.0
OBJECT_FILES_NON_STANDARD := y
@@ -23,8 +23,6 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+hostprogs-y := modpost mk_elfconfig ksym-provides
always := $(hostprogs-y) empty.o
- CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS)
-
modpost-objs := modpost.o file2alias.o sumversion.o
+ksym-provides-objs := ksym-provides.o
diff --git a/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch b/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch
index 799159ed79..81066aa1a5 100644
--- a/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch
+++ b/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch
@@ -46,7 +46,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
--- a/Makefile
+++ b/Makefile
-@@ -977,6 +977,15 @@ ifdef CONFIG_STACK_VALIDATION
+@@ -972,6 +972,15 @@ ifdef CONFIG_STACK_VALIDATION
endif
endif
@@ -62,7 +62,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
ifeq ($(KBUILD_EXTMOD),)
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
-@@ -1106,7 +1115,8 @@ endif
+@@ -1101,7 +1110,8 @@ endif
# that need to depend on updated CONFIG_* values can be checked here.
prepare2: prepare3 outputmakefile asm-generic
@@ -71,7 +71,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+ $(suse_version_h)
$(cmd_crmodverdir)
- macroprepare: prepare1 archmacros
+ archprepare: archheaders archscripts prepare1 scripts_basic
--- a/init/Kconfig.suse
+++ b/init/Kconfig.suse
@@ -1,6 +1,75 @@
diff --git a/patches.suse/rtlwifi-Fix-leak-of-skb-when-processing-C2H_BT_INFO.patch b/patches.suse/rtlwifi-Fix-leak-of-skb-when-processing-C2H_BT_INFO.patch
deleted file mode 100644
index c154632d37..0000000000
--- a/patches.suse/rtlwifi-Fix-leak-of-skb-when-processing-C2H_BT_INFO.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Sat, 17 Nov 2018 20:55:03 -0600
-Subject: rtlwifi: Fix leak of skb when processing C2H_BT_INFO
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Patch-mainline: v4.20 or v4.20-rc8 (next release)
-Git-commit: 8cfa272b0d321160ebb5b45073e39ef0a6ad73f2
-References: bsc#1116448
-
-With commit 0a9f8f0a1ba9 ("rtlwifi: fix btmpinfo timeout while processing
-C2H_BT_INFO"), calling rtl_c2hcmd_enqueue() with rtl_c2h_fast_cmd() true,
-the routine returns without freeing that skb, thereby leaking it.
-
-This issue has been discussed at https://github.com/lwfinger/rtlwifi_new/issues/401
-and the fix tested there.
-
-Fixes: 0a9f8f0a1ba9 ("rtlwifi: fix btmpinfo timeout while processing C2H_BT_INFO")
-Reported-and-tested-by: Francisco Machado Magalhães Neto <franmagneto@gmail.com>
-Cc: Francisco Machado Magalhães Neto <franmagneto@gmail.com>
-Cc: Ping-Ke Shih <pkshih@realtek.com>
-Cc: Stable <stable@vger.kernel.org> # 4.18+
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Acked-by: Michal Kubecek <mkubecek@suse.cz>
-
----
- drivers/net/wireless/realtek/rtlwifi/base.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/realtek/rtlwifi/base.c
-+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
-@@ -2289,6 +2289,7 @@ void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, struct sk_buff *skb)
-
- if (rtl_c2h_fast_cmd(hw, skb)) {
- rtl_c2h_content_parsing(hw, skb);
-+ kfree_skb(skb);
- return;
- }
-
diff --git a/rpm/config.sh b/rpm/config.sh
index f2371fb6eb..0606587b82 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc7
+SRCVERSION=4.20
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
diff --git a/series.conf b/series.conf
index 089f6ca666..2ba3ba5534 100644
--- a/series.conf
+++ b/series.conf
@@ -309,7 +309,6 @@
# Wireless Networking
########################################################
patches.suse/b43-missing-firmware-info.patch
- patches.suse/rtlwifi-Fix-leak-of-skb-when-processing-C2H_BT_INFO.patch
########################################################
# ISDN