From dbc6631ed7308e1496c3caa521882cd423adc223 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Mon, 7 Aug 2017 08:08:16 -0500 Subject: [PATCH] UBUNTU: Rebase to v4.13-rc4 Signed-off-by: Seth Forshee --- debian.master/changelog | 4 ++++ debian.master/config/amd64/config.common.amd64 | 2 +- debian.master/config/arm64/config.common.arm64 | 2 +- debian.master/config/armhf/config.common.armhf | 2 +- debian.master/config/config.common.ubuntu | 3 --- debian.master/config/i386/config.common.i386 | 2 +- debian.master/config/ppc64el/config.common.ppc64el | 2 +- debian.master/config/s390x/config.common.s390x | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian.master/changelog b/debian.master/changelog index 3e02823c2ef90..0d007565b07c6 100644 --- 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 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 index 3a13dcc79471d..6b21d7e75fa42 100644 --- 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 index 7d1b839f72af8..482adacc1d37a 100644 --- 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 index 77caad1c50bd6..8fa46c6202591 100644 --- 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 index 566076925c8e8..8f9b5a877447a 100644 --- 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 index c3bdc69b1b3cb..d77da93b4e62a 100644 --- 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 index 2a2dfc5dbe6aa..2796510c99121 100644 --- 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 index 0ad5d174fa4c9..327f5fefbab95 100644 --- 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