UBUNTU: Rebase to v4.13-rc6

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 772e089cddcf4b9c99236206c8e7ff44a86a8f3e..c40c88d0244be620ac8e9a2a12e33adf46ccf2b4 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (4.13.0-6.7) UNRELEASED; urgency=low
   CHANGELOG: Use the printchanges target to see the curent changes.
   CHANGELOG: Use the insertchanges target to create the final log.
 
+  [ Upstream Kernel Changes ]
+
+  * Rebase to v4.13-rc6
+
  -- Seth Forshee <seth.forshee@canonical.com>  Wed, 16 Aug 2017 08:09:50 -0500
 
 linux (4.13.0-5.6) artful; urgency=low

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c961bc9d9185282fd5bfe5d6f58a5778a03daf7e..950a2bdf23739eed138416302c94532a8f33e987 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3205,6 +3205,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR_PERF=y
 CONFIG_HAS_DMA=y
@@ -8150,6 +8151,7 @@ CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI=m
 CONFIG_SND_SEQ_MIDI_EMUL=m
 CONFIG_SND_SEQ_MIDI_EVENT=m
 CONFIG_SND_SEQ_VIRMIDI=m