Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-08-20 22:15:39 -0400
committerJeff Mahoney <jeffm@suse.com>2017-08-20 22:15:39 -0400
commitee50b897ce5bb0d39a03f788f6386f5f9dce854a (patch)
tree43f917cb4f1201a4b1ccff1a471a92a7cfbe6f87
parent75e287e32a63771df309d6aadd7624cb1465bb0c (diff)
Update to 4.13-rc6.
-rw-r--r--config/arm64/default3
-rw-r--r--config/armv6hl/default3
-rw-r--r--config/armv7hl/default3
-rw-r--r--config/armv7hl/lpae3
-rw-r--r--config/i386/default1
-rw-r--r--config/i386/pae3
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64le/default3
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/default4
-rw-r--r--rpm/config.sh2
12 files changed, 21 insertions, 11 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 651d8b5f1a..17096a091e 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.13.0-rc5 Kernel Configuration
+# Linux/arm64 4.13.0-rc6 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -5670,6 +5670,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_MIDI_EMUL=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
diff --git a/config/armv6hl/default b/config/armv6hl/default
index c4be67dd84..59f9e37e27 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc5 Kernel Configuration
+# Linux/arm 4.13.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -4621,6 +4621,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 03e87dc15f..15aaed1e17 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc5 Kernel Configuration
+# Linux/arm 4.13.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6094,6 +6094,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index b5667da273..a5eeec8ed9 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc5 Kernel Configuration
+# Linux/arm 4.13.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -5862,6 +5862,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
diff --git a/config/i386/default b/config/i386/default
index 5aca54feef..90b74aa203 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -309,6 +309,7 @@ CONFIG_SND_SB8_DSP=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SBAWE_SEQ=m
CONFIG_SND_SC6000=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SOC_HDMI_CODEC=m
diff --git a/config/i386/pae b/config/i386/pae
index e4bdb6d1b9..2af9296ab4 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.13.0-rc5 Kernel Configuration
+# Linux/i386 4.13.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -5654,6 +5654,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_MIDI_EMUL=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
diff --git a/config/ppc64/default b/config/ppc64/default
index bb3bccec5f..6d881cb75c 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.13.0-rc5 Kernel Configuration
+# Linux/powerpc 4.13.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -5012,6 +5012,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
diff --git a/config/ppc64le/default b/config/ppc64le/default
index f006a7743f..1c2ee7b7d1 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.13.0-rc5 Kernel Configuration
+# Linux/powerpc 4.13.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4880,6 +4880,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
diff --git a/config/s390x/default b/config/s390x/default
index 010d62464b..ea4785903c 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.13.0-rc5 Kernel Configuration
+# Linux/s390 4.13.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 4c9714210b..4c967058ba 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.13.0-rc5 Kernel Configuration
+# Linux/s390 4.13.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/default b/config/x86_64/default
index f478aefa61..0fec513f62 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-rc5 Kernel Configuration
+# Linux/x86_64 4.13.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -5628,6 +5628,7 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_MIDI_EMUL=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m
@@ -7958,6 +7959,7 @@ CONFIG_ARCH_HAS_KCOV=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
diff --git a/rpm/config.sh b/rpm/config.sh
index 5100a41cb1..b47c2988e0 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.13-rc5
+SRCVERSION=4.13-rc6
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against