Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-17 12:05:51 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-17 12:05:51 +0100
commitd3f1c97eb97f53a71786a705c58f556e3edbde7d (patch)
tree2d58000008592a64cec2a3a4923ae476132a240a
parent3ffa3aaac4ca62d099f21fcbeb32232fbdec1cd4 (diff)
Automatically updated to 4.20-rc6-next-20181217
-rw-r--r--config/arm64/vanilla12
-rw-r--r--config/armv7hl/vanilla3
-rw-r--r--config/i386/vanilla10
-rw-r--r--config/ppc64/vanilla1
-rw-r--r--config/ppc64le/vanilla1
-rw-r--r--config/x86_64/vanilla10
-rw-r--r--rpm/config.sh2
7 files changed, 34 insertions, 5 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 0f52b397d3..c4ee267bf9 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -262,7 +262,6 @@ CONFIG_ARCH_MEDIATEK=y
CONFIG_ARCH_MESON=y
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
-CONFIG_SOC_IMX8MQ=y
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_REALTEK=y
# CONFIG_ARCH_RENESAS is not set
@@ -436,6 +435,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_HIBERNATION_HEADER=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -491,6 +491,7 @@ CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
CONFIG_ARM_MEDIATEK_CPUFREQ=m
CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
CONFIG_ARM_SCMI_CPUFREQ=m
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
# CONFIG_ARM_TEGRA124_CPUFREQ is not set
@@ -4430,8 +4431,6 @@ CONFIG_PINCTRL_AS370=y
# CONFIG_PINCTRL_BERLIN_BG2CD is not set
# CONFIG_PINCTRL_BERLIN_BG2Q is not set
CONFIG_PINCTRL_BERLIN_BG4CT=y
-CONFIG_PINCTRL_IMX=y
-CONFIG_PINCTRL_IMX8MQ=y
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y
@@ -6229,6 +6228,7 @@ CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_SEQ_DEVICE=m
CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
CONFIG_SND_JACK=y
CONFIG_SND_JACK_INPUT_DEV=y
CONFIG_SND_OSSEMUL=y
@@ -6386,6 +6386,7 @@ CONFIG_SND_FIREFACE=m
CONFIG_SND_SOC=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
# CONFIG_SND_SOC_AMD_ACP is not set
# CONFIG_SND_ATMEL_SOC is not set
CONFIG_SND_BCM2835_SOC_I2S=m
@@ -7901,6 +7902,10 @@ CONFIG_COMMON_CLK_HI6220=y
CONFIG_RESET_HISI=y
CONFIG_STUB_CLK_HI6220=y
CONFIG_STUB_CLK_HI3660=y
+CONFIG_MXC_CLK=y
+CONFIG_MXC_CLK_SCU=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
#
# Clock driver for MediaTek SoC
@@ -8122,7 +8127,6 @@ CONFIG_FSL_MC_DPIO=m
#
# i.MX SoC drivers
#
-CONFIG_IMX_GPCV2_PM_DOMAINS=y
#
# MediaTek SoC drivers
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 5894603457..0678cd663c 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -713,6 +713,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=m
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
CONFIG_ARM_MEDIATEK_CPUFREQ=m
CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
CONFIG_ARM_S5PV210_CPUFREQ=y
CONFIG_ARM_SCMI_CPUFREQ=m
CONFIG_ARM_SPEAR_CPUFREQ=y
@@ -787,6 +788,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@@ -8122,6 +8124,7 @@ CONFIG_COMMON_CLK_HI3670=y
CONFIG_COMMON_CLK_HI6220=y
CONFIG_RESET_HISI=y
# CONFIG_STUB_CLK_HI6220 is not set
+CONFIG_MXC_CLK=y
CONFIG_COMMON_CLK_KEYSTONE=y
CONFIG_TI_SCI_CLK=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 67e4f4f609..b246ae62ce 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -307,6 +307,7 @@ CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_DEBUG_FS=y
CONFIG_XEN_PVH=y
CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
# CONFIG_KVM_DEBUG_FS is not set
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PARAVIRT_CLOCK=y
@@ -486,6 +487,7 @@ CONFIG_PM_CLK=y
CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_SUPPORTS_ACPI=y
CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
@@ -6092,6 +6094,13 @@ CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
@@ -7318,6 +7327,7 @@ CONFIG_COMMON_CLK_CS2000_CP=m
# CONFIG_COMMON_CLK_STM32MP157 is not set
# CONFIG_COMMON_CLK_STM32F is not set
# CONFIG_COMMON_CLK_STM32H7 is not set
+# CONFIG_MXC_CLK is not set
CONFIG_HWSPINLOCK=y
#
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 68f198caa5..9c98b7a860 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -494,6 +494,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_ENERGY_MODEL=y
CONFIG_SECCOMP=y
CONFIG_PPC_MEM_KEYS=y
CONFIG_ISA_DMA_API=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 6c4f7c0d41..3eb593652d 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -433,6 +433,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_ENERGY_MODEL=y
CONFIG_SECCOMP=y
CONFIG_PPC_MEM_KEYS=y
CONFIG_ISA_DMA_API=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 4eed43b721..8883c8180d 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -316,6 +316,7 @@ CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_DEBUG_FS=y
CONFIG_XEN_PVH=y
CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
# CONFIG_KVM_DEBUG_FS is not set
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PARAVIRT_CLOCK=y
@@ -485,6 +486,7 @@ CONFIG_PM_CLK=y
CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_SUPPORTS_ACPI=y
CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
@@ -6083,6 +6085,13 @@ CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
@@ -7326,6 +7335,7 @@ CONFIG_COMMON_CLK_CS2000_CP=m
# CONFIG_COMMON_CLK_STM32MP157 is not set
# CONFIG_COMMON_CLK_STM32F is not set
# CONFIG_COMMON_CLK_STM32H7 is not set
+# CONFIG_MXC_CLK is not set
CONFIG_HWSPINLOCK=y
#
diff --git a/rpm/config.sh b/rpm/config.sh
index 760b40452d..bbd8e564bc 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc6-next-20181214
+SRCVERSION=4.20-rc6-next-20181217
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all