Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-19 12:04:50 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-19 12:04:50 +0100
commit618a186514fd5cf7798d907c846606a7ac073402 (patch)
treeda6c9582b1124104272890103d42a44177501a2e
parent18e496c7f3bced91d4b3d5d85cb21e40f0429cf4 (diff)
Automatically updated to 4.20-rc7-next-20181219
-rw-r--r--config/arm64/vanilla4
-rw-r--r--config/armv7hl/vanilla42
-rw-r--r--config/i386/vanilla4
-rw-r--r--config/ppc64/vanilla3
-rw-r--r--config/ppc64le/vanilla3
-rw-r--r--config/x86_64/vanilla5
-rw-r--r--rpm/config.sh2
7 files changed, 40 insertions, 23 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 814f647098..70c63ba1d2 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -8691,6 +8691,7 @@ CONFIG_ALPINE_MSI=y
CONFIG_BRCMSTB_L2_IRQ=y
CONFIG_DW_APB_ICTL=y
CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_MADERA_IRQ=m
CONFIG_MVEBU_GICP=y
CONFIG_MVEBU_ICU=y
CONFIG_MVEBU_ODMI=y
@@ -8701,6 +8702,7 @@ CONFIG_PARTITION_PERCPU=y
CONFIG_QCOM_IRQ_COMBINER=y
CONFIG_MESON_IRQ_GPIO=y
CONFIG_QCOM_PDC=y
+CONFIG_IMX_IRQSTEER=y
CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
@@ -9666,7 +9668,7 @@ CONFIG_OBJAGG=m
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
-CONFIG_PRINTK_FROM=y
+CONFIG_PRINTK_CALLER=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index e996194e89..abc8dc12e9 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -6537,11 +6537,6 @@ CONFIG_SND_SOC_ADI_AXI_SPDIF=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_SOC_MIKROE_PROTO=m
CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_SND_EDMA_SOC=m
-# CONFIG_SND_DAVINCI_SOC_I2S is not set
-CONFIG_SND_DAVINCI_SOC_MCASP=m
-CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
-CONFIG_SND_AM33XX_SOC_EVM=m
CONFIG_SND_DESIGNWARE_I2S=m
# CONFIG_SND_DESIGNWARE_PCM is not set
@@ -6573,16 +6568,6 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_FSL_ASOC_CARD=m
CONFIG_SND_I2S_HI6210_I2S=m
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_SDMA_SOC=m
-CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
-CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
-CONFIG_SND_OMAP_SOC_RX51=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
CONFIG_SND_KIRKWOOD_SOC=m
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
# CONFIG_SND_SOC_IMG is not set
@@ -6675,6 +6660,29 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
CONFIG_SND_SOC_TEGRA_MAX98090=m
CONFIG_SND_SOC_TEGRA_RT5677=m
CONFIG_SND_SOC_TEGRA_SGTL5000=m
+
+#
+# Audio support for Texas Instruments SoCs
+#
+CONFIG_SND_SOC_TI_EDMA_PCM=m
+CONFIG_SND_SOC_TI_SDMA_PCM=m
+
+#
+# Texas Instruments DAI support for:
+#
+CONFIG_SND_SOC_DAVINCI_MCASP=m
+CONFIG_SND_SOC_OMAP_DMIC=m
+CONFIG_SND_SOC_OMAP_MCBSP=m
+CONFIG_SND_SOC_OMAP_MCPDM=m
+
+#
+# Audio support for boards with Texas Instruments SoCs
+#
+CONFIG_SND_SOC_NOKIA_RX51=m
+CONFIG_SND_SOC_OMAP3_PANDORA=m
+CONFIG_SND_SOC_OMAP3_TWL4030=m
+CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_SOC_OMAP_HDMI=m
CONFIG_SND_SOC_UX500=m
CONFIG_SND_SOC_UX500_PLAT_DMA=m
CONFIG_SND_SOC_XILINX_I2S=m
@@ -8991,6 +8999,7 @@ CONFIG_ARMADA_370_XP_IRQ=y
CONFIG_BCM7120_L2_IRQ=y
CONFIG_BRCMSTB_L2_IRQ=y
CONFIG_DW_APB_ICTL=y
+CONFIG_MADERA_IRQ=m
CONFIG_OMAP_IRQCHIP=y
CONFIG_ORION_IRQCHIP=y
CONFIG_ST_IRQCHIP=y
@@ -9002,6 +9011,7 @@ CONFIG_LS_SCFG_MSI=y
CONFIG_PARTITION_PERCPU=y
CONFIG_MESON_IRQ_GPIO=y
CONFIG_QCOM_PDC=y
+CONFIG_IMX_IRQSTEER=y
CONFIG_IPACK_BUS=m
# CONFIG_BOARD_TPCI200 is not set
# CONFIG_SERIAL_IPOCTAL is not set
@@ -9950,7 +9960,7 @@ CONFIG_OBJAGG=m
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
-CONFIG_PRINTK_FROM=y
+CONFIG_PRINTK_CALLER=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 0c92d1742f..8a3c86365a 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -7073,6 +7073,7 @@ CONFIG_XEN_AUTO_XLATE=y
CONFIG_XEN_ACPI=y
CONFIG_XEN_SYMS=y
CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
CONFIG_STAGING=y
CONFIG_PRISM2_USB=m
# CONFIG_COMEDI is not set
@@ -7851,6 +7852,7 @@ CONFIG_PWM_PCA9685=m
#
CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_ARM_GIC_V3_ITS is not set
+CONFIG_MADERA_IRQ=m
CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
@@ -8704,7 +8706,7 @@ CONFIG_OBJAGG=m
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
-CONFIG_PRINTK_FROM=y
+CONFIG_PRINTK_CALLER=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 9948d56a54..c51219ac4c 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -6303,6 +6303,7 @@ CONFIG_PWM_LP3943=m
CONFIG_IRQCHIP=y
CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_ARM_GIC_V3_ITS is not set
+CONFIG_MADERA_IRQ=m
CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
@@ -7125,7 +7126,7 @@ CONFIG_OBJAGG=m
# printk and dmesg options
#
# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK_FROM=y
+CONFIG_PRINTK_CALLER=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 9decfd1acd..a8709774a6 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -6155,6 +6155,7 @@ CONFIG_PWM_LP3943=m
CONFIG_IRQCHIP=y
CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_ARM_GIC_V3_ITS is not set
+CONFIG_MADERA_IRQ=m
CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
@@ -6976,7 +6977,7 @@ CONFIG_OBJAGG=m
# printk and dmesg options
#
# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK_FROM=y
+CONFIG_PRINTK_CALLER=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 10cd824060..3783ebe309 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -414,7 +414,6 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
CONFIG_X86_SMAP=y
CONFIG_X86_INTEL_UMIP=y
-CONFIG_X86_INTEL_MPX=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
@@ -7079,6 +7078,7 @@ CONFIG_XEN_AUTO_XLATE=y
CONFIG_XEN_ACPI=y
CONFIG_XEN_SYMS=y
CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
CONFIG_STAGING=y
CONFIG_PRISM2_USB=m
# CONFIG_COMEDI is not set
@@ -7863,6 +7863,7 @@ CONFIG_PWM_PCA9685=m
#
CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_ARM_GIC_V3_ITS is not set
+CONFIG_MADERA_IRQ=m
CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
@@ -8757,7 +8758,7 @@ CONFIG_OBJAGG=m
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
-CONFIG_PRINTK_FROM=y
+CONFIG_PRINTK_CALLER=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
diff --git a/rpm/config.sh b/rpm/config.sh
index 44d58feb21..e767262ce5 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc7-next-20181218
+SRCVERSION=4.20-rc7-next-20181219
# 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