UBUNTU: Rebase to v4.13-rc4

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
mariux64 · Aug 8, 2017 · dbc6631 · dbc6631
1 parent 5e4856a
commit dbc6631
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/debian.master/changelog b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (4.13.0-4.5) 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-rc4
+
  -- Seth Forshee <seth.forshee@canonical.com>  Mon, 07 Aug 2017 08:02:39 -0500
 
 linux (4.13.0-3.4) artful; urgency=low

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
@@ -191,6 +191,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MCB=m
+CONFIG_MDIO_BUS=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEGARAID_LEGACY=m
@@ -427,7 +428,6 @@ CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y
-CONFIG_SOC_ZTE=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SOUND=m
 CONFIG_SPI=y

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
@@ -208,6 +208,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MCB=m
+CONFIG_MDIO_BUS=y
 CONFIG_MDIO_BUS_MUX=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MEDIA_SUPPORT=m
@@ -446,7 +447,6 @@ CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y
-CONFIG_SOC_ZTE=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SOUND=m
 CONFIG_SPI=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
@@ -191,6 +191,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MCB=m
+CONFIG_MDIO_BUS=y
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MEDIA_SUPPORT=m
@@ -419,7 +420,6 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_TIMER=y
 CONFIG_SOC_TI=y
-CONFIG_SOC_ZTE=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SOUND=y
 CONFIG_SPI=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
@@ -6241,7 +6241,6 @@ CONFIG_PATA_CS5535=m
 CONFIG_PATA_CS5536=m
 CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
-CONFIG_PATA_FTIDE010=m
 CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
 CONFIG_PATA_HPT3X2N=m
@@ -7388,7 +7387,6 @@ CONFIG_SATA_AHCI_SEATTLE=m
 CONFIG_SATA_DWC=m
 # CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_SATA_DWC_OLD_DMA=y
-CONFIG_SATA_GEMINI=m
 CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
@@ -10199,5 +10197,4 @@ CONFIG_ZRAM=m
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSWAP=y
-CONFIG_ZX2967_PM_DOMAINS=y
 CONFIG_ZX_TDM=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
@@ -188,6 +188,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MCB=m
+CONFIG_MDIO_BUS=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEGARAID_LEGACY=m
@@ -421,7 +422,6 @@ CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y
-CONFIG_SOC_ZTE=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SOUND=m
 CONFIG_SPI=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
@@ -192,6 +192,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MCB=m
+CONFIG_MDIO_BUS=y
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MEDIA_SUPPORT=m
@@ -425,7 +426,6 @@ CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y
-CONFIG_SOC_ZTE=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SOUND=m
 CONFIG_SPI=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
@@ -166,6 +166,7 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_MAILBOX is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_MCB is not set
+CONFIG_MDIO_BUS=m
 CONFIG_MD_MULTIPATH=y
 # CONFIG_MEDIA_SUPPORT is not set
 # CONFIG_MEGARAID_LEGACY is not set
@@ -354,7 +355,6 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_SLIP is not set
 # CONFIG_SOC_TI is not set
-# CONFIG_SOC_ZTE is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPI is not set