Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-25 12:01:57 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-25 12:01:57 +0100
commita1129b80c434e5623c32a7fd4ebbf5934694976b (patch)
tree0c4f1c706865dec71f8d88820449ff1d25ba4f7d
parentb36b014a4b5b50e0f60e58c33801d83a252e39d7 (diff)
Automatically updated to 4.20-rc7-next-20181224
-rw-r--r--config/arm64/vanilla17
-rw-r--r--config/armv7hl/vanilla13
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/ppc64/vanilla7
-rw-r--r--config/ppc64le/vanilla7
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--rpm/config.sh2
7 files changed, 42 insertions, 10 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index db759d6fb7..88dcb27ec7 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -3884,6 +3884,7 @@ CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
@@ -4417,6 +4418,7 @@ CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_MAX77620=m
CONFIG_PINCTRL_RK805=m
+CONFIG_PINCTRL_OCELOT=y
CONFIG_PINCTRL_OWL=y
CONFIG_PINCTRL_S700=y
CONFIG_PINCTRL_S900=y
@@ -4429,6 +4431,9 @@ 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_IMX_SCU=y
+CONFIG_PINCTRL_IMX8QXP=y
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y
@@ -4489,11 +4494,12 @@ CONFIG_PINCTRL_TEGRA_XUSB=y
#
CONFIG_EINT_MTK=y
CONFIG_PINCTRL_MTK=y
-# CONFIG_PINCTRL_MTK_MOORE is not set
+CONFIG_PINCTRL_MTK_MOORE=y
CONFIG_PINCTRL_MTK_PARIS=y
CONFIG_PINCTRL_MT2712=y
CONFIG_PINCTRL_MT6765=y
CONFIG_PINCTRL_MT6797=y
+CONFIG_PINCTRL_MT7622=y
CONFIG_PINCTRL_MT8173=y
CONFIG_PINCTRL_MT8183=y
CONFIG_PINCTRL_ZX=y
@@ -4527,6 +4533,7 @@ CONFIG_GPIO_74XX_MMIO=m
# CONFIG_GPIO_AMDPT is not set
CONFIG_GPIO_RASPBERRYPI_EXP=m
CONFIG_GPIO_BRCMSTB=m
+CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EIC_SPRD=m
# CONFIG_GPIO_EXAR is not set
@@ -4541,6 +4548,7 @@ CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_MXC=y
CONFIG_GPIO_PL061=y
CONFIG_GPIO_PMIC_EIC_SPRD=m
+CONFIG_GPIO_SAMA5D2_PIOBU=m
CONFIG_GPIO_SPRD=m
CONFIG_GPIO_SYSCON=m
CONFIG_GPIO_TEGRA=y
@@ -4955,6 +4963,7 @@ CONFIG_MEDIATEK_WATCHDOG=m
CONFIG_ZX2967_WATCHDOG=m
CONFIG_RTD119X_WATCHDOG=y
CONFIG_SPRD_WATCHDOG=m
+CONFIG_PM8916_WATCHDOG=m
CONFIG_ALIM7101_WDT=m
CONFIG_I6300ESB_WDT=m
CONFIG_KEMPLD_WDT=m
@@ -6491,6 +6500,7 @@ CONFIG_SND_SUN4I_I2S=m
CONFIG_SND_SUN4I_SPDIF=m
CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
CONFIG_SND_SOC_XTFPGA_I2S=m
# CONFIG_ZX_SPDIF is not set
# CONFIG_ZX_I2S is not set
@@ -6581,6 +6591,7 @@ CONFIG_SND_SOC_PCM3060_SPI=m
CONFIG_SND_SOC_PCM512x=m
CONFIG_SND_SOC_PCM512x_I2C=m
CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5514_SPI=m
@@ -6641,6 +6652,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SOC_WM8804_SPI=m
CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
CONFIG_SND_SOC_WM8960=m
CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m
@@ -6657,9 +6669,7 @@ CONFIG_SND_SOC_NAU8824=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m
CONFIG_AC97_BUS=m
#
@@ -7537,6 +7547,7 @@ CONFIG_RTC_DRV_TEGRA=m
CONFIG_RTC_DRV_MXC=m
CONFIG_RTC_DRV_MXC_V2=m
# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_IMX_SC=m
CONFIG_RTC_DRV_MT7622=m
CONFIG_RTC_DRV_XGENE=y
CONFIG_RTC_DRV_R7301=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index a386599eac..5337f977a9 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -3813,6 +3813,7 @@ CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
@@ -4387,6 +4388,7 @@ CONFIG_PINCTRL_ST=y
CONFIG_PINCTRL_PALMAS=y
CONFIG_PINCTRL_ZYNQ=y
CONFIG_PINCTRL_RK805=m
+CONFIG_PINCTRL_OCELOT=y
CONFIG_PINCTRL_OWL=y
CONFIG_PINCTRL_S700=y
# CONFIG_PINCTRL_S900 is not set
@@ -4490,9 +4492,9 @@ CONFIG_PINCTRL_WM8850=y
#
CONFIG_EINT_MTK=y
CONFIG_PINCTRL_MTK=y
-# CONFIG_PINCTRL_MTK_MOORE is not set
-# CONFIG_PINCTRL_MTK_PARIS is not set
+CONFIG_PINCTRL_MTK_MOORE=y
CONFIG_PINCTRL_MT2701=y
+CONFIG_PINCTRL_MT7623=y
CONFIG_PINCTRL_MT8135=y
CONFIG_PINCTRL_MT8127=y
CONFIG_PINCTRL_MT6397=y
@@ -4522,6 +4524,7 @@ CONFIG_GPIO_ALTERA=m
CONFIG_GPIO_RASPBERRYPI_EXP=m
CONFIG_GPIO_BCM_KONA=y
CONFIG_GPIO_BRCMSTB=m
+CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_DAVINCI=y
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_EXAR is not set
@@ -4536,6 +4539,7 @@ CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_MXC=y
CONFIG_GPIO_OMAP=y
CONFIG_GPIO_PL061=y
+CONFIG_GPIO_SAMA5D2_PIOBU=m
CONFIG_GPIO_SPEAR_SPICS=y
CONFIG_GPIO_SYSCON=m
CONFIG_GPIO_TEGRA=y
@@ -6687,6 +6691,7 @@ CONFIG_SND_SOC_OMAP_HDMI=m
CONFIG_SND_SOC_UX500=m
CONFIG_SND_SOC_UX500_PLAT_DMA=m
CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
CONFIG_SND_SOC_XTFPGA_I2S=m
CONFIG_ZX_TDM=m
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -6777,6 +6782,7 @@ CONFIG_SND_SOC_PCM3060_SPI=m
CONFIG_SND_SOC_PCM512x=m
CONFIG_SND_SOC_PCM512x_I2C=m
CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_RT5514_SPI_BUILTIN is not set
CONFIG_SND_SOC_RT5616=m
@@ -6839,6 +6845,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SOC_WM8804_SPI=m
CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
CONFIG_SND_SOC_WM8960=m
CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m
@@ -6856,9 +6863,7 @@ CONFIG_SND_SOC_NAU8824=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m
CONFIG_AC97_BUS=m
#
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 38111f5d7b..a2645af384 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -6138,6 +6138,7 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
# STMicroelectronics STM32 SOC audio support
#
CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_ZX_TDM=m
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -6213,6 +6214,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_PCM3168A_SPI is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set
# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT286=m
@@ -6274,6 +6276,7 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_WM8804_I2C is not set
# CONFIG_SND_SOC_WM8804_SPI is not set
# CONFIG_SND_SOC_WM8903 is not set
+CONFIG_SND_SOC_WM8904=m
# CONFIG_SND_SOC_WM8960 is not set
# CONFIG_SND_SOC_WM8962 is not set
# CONFIG_SND_SOC_WM8974 is not set
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index c251334922..f51ce521b6 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1736,7 +1736,7 @@ CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_W1=m
-CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_DMA_FENCE_TRACE is not set
@@ -3827,7 +3827,9 @@ CONFIG_PTP_1588_CLOCK=m
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
#
CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set
@@ -3835,6 +3837,7 @@ CONFIG_PINCTRL_AMD=m
# CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_SINGLE is not set
# CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_OCELOT=y
CONFIG_PINCTRL_MADERA=m
CONFIG_PINCTRL_CS47L35=y
CONFIG_PINCTRL_CS47L85=y
@@ -3853,6 +3856,7 @@ CONFIG_GPIO_MAX730X=m
#
CONFIG_GPIO_74XX_MMIO=m
# CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_CADENCE=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -6090,6 +6094,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_MMAP=y
CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI_NVLINK2=y
CONFIG_VFIO_MDEV=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_IRQ_BYPASS_MANAGER=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 197e19e412..b1af7f1ec9 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1642,7 +1642,7 @@ CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_W1=m
-CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_DMA_FENCE_TRACE is not set
@@ -3697,7 +3697,9 @@ CONFIG_PTP_1588_CLOCK=m
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
#
CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set
@@ -3705,6 +3707,7 @@ CONFIG_PINCTRL_AMD=m
# CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_SINGLE is not set
# CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_OCELOT=y
CONFIG_PINCTRL_MADERA=m
CONFIG_PINCTRL_CS47L35=y
CONFIG_PINCTRL_CS47L85=y
@@ -3723,6 +3726,7 @@ CONFIG_GPIO_MAX730X=m
#
CONFIG_GPIO_74XX_MMIO=m
# CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_CADENCE=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -5942,6 +5946,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_MMAP=y
CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI_NVLINK2=y
CONFIG_VFIO_MDEV=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_IRQ_BYPASS_MANAGER=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index bb388505b0..3664527a4b 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -6129,6 +6129,7 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
# STMicroelectronics STM32 SOC audio support
#
CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_ZX_TDM=m
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -6204,6 +6205,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_PCM3168A_SPI is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set
# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT286=m
@@ -6265,6 +6267,7 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_WM8804_I2C is not set
# CONFIG_SND_SOC_WM8804_SPI is not set
# CONFIG_SND_SOC_WM8903 is not set
+CONFIG_SND_SOC_WM8904=m
# CONFIG_SND_SOC_WM8960 is not set
# CONFIG_SND_SOC_WM8962 is not set
# CONFIG_SND_SOC_WM8974 is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index 09282e6b86..da4ac1f238 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-20181221
+SRCVERSION=4.20-rc7-next-20181224
# 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