Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-11-12 07:01:19 +0100
committerMichal Kubecek <mkubecek@suse.cz>2018-11-12 07:01:19 +0100
commit1c08d7ff714751983de4f9f3f5ee8458a2b04583 (patch)
tree7b8ff48cf48920860600b8e9248c5806dd1cfd33
parent46cb36e96ccf9576847e3249659c926c7459f9cd (diff)
Update to 4.20-rc2
- Eliminated 1 patch - Config changes: - I2C: I2C_NVIDIA_GPU=m - USB: UCSI_CCG=m
-rw-r--r--config/i386/default1
-rw-r--r--config/i386/pae4
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64le/default4
-rw-r--r--config/s390x/default3
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/default4
-rw-r--r--patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch50
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
10 files changed, 15 insertions, 59 deletions
diff --git a/config/i386/default b/config/i386/default
index 8a5492c3ce..ba08fbd743 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -358,7 +358,6 @@ CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_HTCPEN=m
CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
CONFIG_TREE_RCU=y
-CONFIG_UBIFS_FS_AUTHENTICATION=y
CONFIG_ULTRA=m
# CONFIG_USB_OHCI_HCD_SSB is not set
CONFIG_V4L_RADIO_ISA_DRIVERS=y
diff --git a/config/i386/pae b/config/i386/pae
index 1ad0b167c9..da5f8d9b8d 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.20.0-rc1 Kernel Configuration
+# Linux/i386 4.20.0-rc2 Kernel Configuration
#
#
@@ -4180,6 +4180,7 @@ CONFIG_I2C_PIIX4=m
CONFIG_I2C_CHT_WC=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
@@ -6640,6 +6641,7 @@ CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_FUSB302=m
CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
CONFIG_TYPEC_TPS6598X=m
diff --git a/config/ppc64/default b/config/ppc64/default
index d5a735f4ea..426722954a 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc1 Kernel Configuration
+# Linux/powerpc 4.20.0-rc2 Kernel Configuration
#
#
@@ -3670,6 +3670,7 @@ CONFIG_I2C_AMD8111=m
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 08221ded67..d39f4c3044 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc1 Kernel Configuration
+# Linux/powerpc 4.20.0-rc2 Kernel Configuration
#
#
@@ -3598,6 +3598,7 @@ CONFIG_I2C_AMD8111=m
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
@@ -5639,6 +5640,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_FUSB302=m
CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
CONFIG_TYPEC_TPS6598X=m
#
diff --git a/config/s390x/default b/config/s390x/default
index c443788a74..979b795e2b 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc1 Kernel Configuration
+# Linux/s390 4.20.0-rc2 Kernel Configuration
#
#
@@ -2197,6 +2197,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 2ff2ab3320..f217f7e476 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc1 Kernel Configuration
+# Linux/s390 4.20.0-rc2 Kernel Configuration
#
#
diff --git a/config/x86_64/default b/config/x86_64/default
index 8ef80607e1..c5a93debf1 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-rc1 Kernel Configuration
+# Linux/x86_64 4.20.0-rc2 Kernel Configuration
#
#
@@ -4194,6 +4194,7 @@ CONFIG_I2C_PIIX4=m
CONFIG_I2C_CHT_WC=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
@@ -6637,6 +6638,7 @@ CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_FUSB302=m
CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
CONFIG_TYPEC_TPS6598X=m
diff --git a/patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch b/patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch
deleted file mode 100644
index 9599012e44..0000000000
--- a/patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Wed, 24 Oct 2018 12:36:28 +0200
-Subject: netfilter: bridge: define INT_MIN & INT_MAX in userspace
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Patch-mainline: Queued in subsystem maintainer repository
-Git-commit: 5a8de47b3c250521dd632cdedaac6db88367defa
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
-References: 4.19 fixes
-
-With 4.19, programs like ebtables fail to build when they include
-"linux/netfilter_bridge.h". It is caused by commit 94276fa8a2a4 which
-added a use of INT_MIN and INT_MAX to the header:
-: In file included from /usr/include/linux/netfilter_bridge/ebtables.h:18,
-: from include/ebtables_u.h:28,
-: from communication.c:23:
-: /usr/include/linux/netfilter_bridge.h:30:20: error: 'INT_MIN' undeclared here (not in a function)
-: NF_BR_PRI_FIRST = INT_MIN,
-: ^~~~~~~
-
-Define these constants by including "limits.h" when !__KERNEL__ (the
-same way as for other netfilter_* headers).
-
-Fixes: 94276fa8a2a4 ("netfilter: bridge: Expose nf_tables bridge hook priorities through uapi")
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-Acked-by: Máté Eckl <ecklm94@gmail.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/uapi/linux/netfilter_bridge.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h
-index 156ccd089df1..1610fdbab98d 100644
---- a/include/uapi/linux/netfilter_bridge.h
-+++ b/include/uapi/linux/netfilter_bridge.h
-@@ -11,6 +11,10 @@
- #include <linux/if_vlan.h>
- #include <linux/if_pppox.h>
-
-+#ifndef __KERNEL__
-+#include <limits.h> /* for INT_MIN, INT_MAX */
-+#endif
-+
- /* Bridge Hooks */
- /* After promisc drops, checksum checks. */
- #define NF_BR_PRE_ROUTING 0
---
-2.19.1
-
diff --git a/rpm/config.sh b/rpm/config.sh
index 75d8212a73..1e41df8596 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc1
+SRCVERSION=4.20-rc2
# 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 cf24863df9..18730de8e0 100644
--- a/series.conf
+++ b/series.conf
@@ -209,7 +209,6 @@
# Netfilter
########################################################
patches.suse/netfilter-ip_conntrack_slp.patch
- patches.suse/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch
########################################################
# NFS