Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-07-26 13:55:58 -0400
committerJeff Mahoney <jeffm@suse.com>2017-07-26 13:55:58 -0400
commitb545b8732b541f0c383321cd13736e24c4f00e5a (patch)
treee55389fa3cab7a3f1ec658f2c60d65527823c6e3
parent474729b30d1aca89db089f37c2ac068062493b32 (diff)
Update to 4.13-rc2.
- Eliminated 1 patch. - Config changes: - DRM_VBOXVIDEO=m
-rw-r--r--config/arm64/default6
-rw-r--r--config/armv6hl/default6
-rw-r--r--config/armv7hl/default6
-rw-r--r--config/armv7hl/lpae6
-rw-r--r--config/i386/default4
-rw-r--r--config/i386/pae6
-rw-r--r--config/ppc64/default7
-rw-r--r--config/ppc64le/default5
-rw-r--r--config/s390x/default4
-rw-r--r--config/s390x/zfcpdump3
-rw-r--r--config/x86_64/default6
-rw-r--r--patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch34
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
14 files changed, 30 insertions, 66 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 286b93b710..450756bd35 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.13.0-rc1 Kernel Configuration
+# Linux/arm64 4.13.0-rc2 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -7929,6 +7929,10 @@ CONFIG_TEE=m
#
CONFIG_OPTEE=m
CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
CONFIG_MUX_ADG792A=m
CONFIG_MUX_GPIO=m
CONFIG_MUX_MMIO=m
diff --git a/config/armv6hl/default b/config/armv6hl/default
index bc746005d0..27b1d87398 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc1 Kernel Configuration
+# Linux/arm 4.13.0-rc2 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6208,6 +6208,10 @@ CONFIG_NVMEM=y
#
# CONFIG_FSI is not set
CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
CONFIG_MUX_ADG792A=m
CONFIG_MUX_GPIO=m
CONFIG_MUX_MMIO=m
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 848cfc68e5..66359edb9f 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc1 Kernel Configuration
+# Linux/arm 4.13.0-rc2 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -8583,6 +8583,10 @@ CONFIG_TEE=m
#
CONFIG_OPTEE=m
CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
CONFIG_MUX_ADG792A=m
CONFIG_MUX_GPIO=m
CONFIG_MUX_MMIO=m
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 5d667b9670..4c654e11f7 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc1 Kernel Configuration
+# Linux/arm 4.13.0-rc2 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -8181,6 +8181,10 @@ CONFIG_TEE=m
#
CONFIG_OPTEE=m
CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
CONFIG_MUX_ADG792A=m
CONFIG_MUX_GPIO=m
CONFIG_MUX_MMIO=m
diff --git a/config/i386/default b/config/i386/default
index a76093c231..4978f10c73 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -5,7 +5,6 @@ CONFIG_3C515=m
# CONFIG_AK8974 is not set
# CONFIG_ALTERA_PR_IP_CORE_PLAT is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
CONFIG_ATA=m
# CONFIG_ATH10K_AHB is not set
# CONFIG_BATTERY_LEGO_EV3 is not set
@@ -61,10 +60,9 @@ CONFIG_DRM_I2C_ADV7533=y
# CONFIG_DRM_SIL_SII8620 is not set
# CONFIG_DRM_TI_TFP410 is not set
# CONFIG_DRM_TOSHIBA_TC358767 is not set
+CONFIG_DRM_VBOXVIDEO=m
CONFIG_DTLK=m
CONFIG_EBC_C384_WDT=m
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
# CONFIG_EISA is not set
CONFIG_EL3=m
# CONFIG_ENVELOPE_DETECTOR is not set
diff --git a/config/i386/pae b/config/i386/pae
index 454bdfeae9..8a494c6845 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.13.0-rc1 Kernel Configuration
+# Linux/i386 4.13.0-rc2 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -6878,6 +6878,7 @@ CONFIG_KS7010=m
CONFIG_TYPEC_TCPM=m
CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_DRM_VBOXVIDEO=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -7491,9 +7492,6 @@ CONFIG_ALTERA_PR_IP_CORE=m
# FSI support
#
# CONFIG_FSI is not set
-CONFIG_MULTIPLEXER=m
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_GPIO is not set
#
# Firmware Drivers
diff --git a/config/ppc64/default b/config/ppc64/default
index 0422bd9913..e4b31a015a 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.13.0-rc1 Kernel Configuration
+# Linux/powerpc 4.13.0-rc2 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2253,12 +2253,10 @@ CONFIG_FIREWIRE_SBP2=m
CONFIG_FIREWIRE_NET=m
CONFIG_FIREWIRE_NOSY=m
CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_ADB=y
CONFIG_ADB_PMU=y
CONFIG_ADB_PMU_LED=y
CONFIG_ADB_PMU_LED_DISK=y
CONFIG_PMAC_SMU=y
-CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_WINDFARM=y
CONFIG_WINDFARM_PM81=y
@@ -6050,9 +6048,6 @@ CONFIG_FSI=m
# CONFIG_FSI_MASTER_GPIO is not set
# CONFIG_FSI_MASTER_HUB is not set
# CONFIG_FSI_SCOM is not set
-CONFIG_MULTIPLEXER=m
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_GPIO is not set
#
# File systems
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 1429d5e7a4..224198eaf8 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.13.0-rc1 Kernel Configuration
+# Linux/powerpc 4.13.0-rc2 Kernel Configuration
#
CONFIG_PPC64=y
@@ -5901,9 +5901,6 @@ CONFIG_FSI=m
# CONFIG_FSI_MASTER_GPIO is not set
# CONFIG_FSI_MASTER_HUB is not set
# CONFIG_FSI_SCOM is not set
-CONFIG_MULTIPLEXER=m
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_GPIO is not set
#
# File systems
diff --git a/config/s390x/default b/config/s390x/default
index 0bb3bef4f9..6a490149db 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.13.0-rc1 Kernel Configuration
+# Linux/s390 4.13.0-rc2 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -2563,8 +2563,6 @@ CONFIG_ALTERA_PR_IP_CORE=m
# FSI support
#
# CONFIG_FSI is not set
-CONFIG_MULTIPLEXER=m
-# CONFIG_MUX_ADG792A is not set
#
# File systems
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 4f64461e6e..138140d6c8 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.13.0-rc1 Kernel Configuration
+# Linux/s390 4.13.0-rc2 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -891,7 +891,6 @@ CONFIG_NVMEM=y
# FSI support
#
# CONFIG_FSI is not set
-CONFIG_MULTIPLEXER=y
#
# File systems
diff --git a/config/x86_64/default b/config/x86_64/default
index 40931e03cf..d9de0cd175 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.13.0-rc1 Kernel Configuration
+# Linux/x86_64 4.13.0-rc2 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -6872,6 +6872,7 @@ CONFIG_KS7010=m
CONFIG_TYPEC_TCPM=m
CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_DRM_VBOXVIDEO=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -7494,9 +7495,6 @@ CONFIG_ALTERA_PR_IP_CORE=m
# FSI support
#
# CONFIG_FSI is not set
-CONFIG_MULTIPLEXER=m
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_GPIO is not set
#
# Firmware Drivers
diff --git a/patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch b/patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch
deleted file mode 100644
index 6ae3d65b96..0000000000
--- a/patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Florian Westphal <fw@strlen.de>
-Date: Mon, 10 Jul 2017 13:53:53 +0200
-Subject: netfilter: expect: fix crash when putting uninited expectation
-Patch-mainline: Queued in subsystem maintainer repository
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
-Git-commit: 36ac344e16e04e3e55e8fed7446095a6458c64e6
-References: bnc#1048935
-
-We crash in __nf_ct_expect_check, it calls nf_ct_remove_expect on the
-uninitialised expectation instead of existing one, so del_timer chokes
-on random memory address.
-
-Fixes: ec0e3f01114ad32711243 ("netfilter: nf_ct_expect: Add nf_ct_remove_expect()")
-Reported-by: Sergey Kvachonok <ravenexp@gmail.com>
-Tested-by: Sergey Kvachonok <ravenexp@gmail.com>
-Cc: Gao Feng <fgao@ikuai8.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- net/netfilter/nf_conntrack_expect.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/netfilter/nf_conntrack_expect.c
-+++ b/net/netfilter/nf_conntrack_expect.c
-@@ -422,7 +422,7 @@ static inline int __nf_ct_expect_check(s
- h = nf_ct_expect_dst_hash(net, &expect->tuple);
- hlist_for_each_entry_safe(i, next, &nf_ct_expect_hash[h], hnode) {
- if (expect_matches(i, expect)) {
-- if (nf_ct_remove_expect(expect))
-+ if (nf_ct_remove_expect(i))
- break;
- } else if (expect_clash(i, expect)) {
- ret = -EBUSY;
diff --git a/rpm/config.sh b/rpm/config.sh
index 89381cc4a0..ff049342dc 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.13-rc1
+SRCVERSION=4.13-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 0160aecfda..e7bc437a74 100644
--- a/series.conf
+++ b/series.conf
@@ -209,7 +209,6 @@
# Netfilter
########################################################
patches.suse/netfilter-ip_conntrack_slp.patch
- patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch
########################################################
# NFS