Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-06 12:04:52 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-06 12:04:52 +0100
commite0e284ede363ba23e6cff16c4b84194528317c4d (patch)
tree1e33c73698b3061a8ff7c4f903ea57c9366f555a
parent7e826c64ad79dcb297662469879da50ecb47994e (diff)
Automatically updated to 4.20-rc5-next-20181206
-rw-r--r--config/arm64/vanilla6
-rw-r--r--config/armv7hl/vanilla6
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/ppc64/vanilla3
-rw-r--r--config/ppc64le/vanilla3
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--rpm/config.sh2
7 files changed, 23 insertions, 3 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 709800fdc1..ec5c6176e2 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -2357,6 +2357,7 @@ CONFIG_ECHO=m
# CONFIG_CXL_AFU_DRIVER_OPS is not set
# CONFIG_CXL_LIB is not set
# CONFIG_OCXL_BASE is not set
+CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_RTSX_PCI=m
CONFIG_MISC_RTSX_USB=m
@@ -3522,6 +3523,7 @@ CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PCIE=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
#
# WiMAX Wireless Broadband devices
@@ -5207,6 +5209,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
CONFIG_VIDEO_V4L2=m
@@ -7162,6 +7165,7 @@ CONFIG_MMC_SDHCI_F_SDH30=m
CONFIG_MMC_SDHCI_IPROC=m
CONFIG_MMC_MESON_GX=m
# CONFIG_MMC_MESON_MX_SDIO is not set
+CONFIG_MMC_ALCOR=m
CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_SPI is not set
@@ -7492,6 +7496,7 @@ CONFIG_DMA_BCM2835=m
CONFIG_DMA_SUN6I=m
CONFIG_DW_AXI_DMAC=m
# CONFIG_FSL_EDMA is not set
+CONFIG_FSL_QDMA=m
# CONFIG_INTEL_IDMA64 is not set
CONFIG_K3_DMA=m
CONFIG_MV_XOR=y
@@ -7684,6 +7689,7 @@ CONFIG_STAGING_MEDIA=y
CONFIG_I2C_BCM2048=m
CONFIG_SOC_CAMERA_IMX074=m
CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_VIDEO_ROCKCHIP_VPU=m
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_SUNXI_CEDRUS=m
CONFIG_TEGRA_VDE=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index d107fdcf6f..7de330cefc 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -2500,6 +2500,7 @@ CONFIG_ECHO=m
# CONFIG_CXL_AFU_DRIVER_OPS is not set
# CONFIG_CXL_LIB is not set
# CONFIG_OCXL_BASE is not set
+CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_RTSX_PCI=m
CONFIG_MISC_RTSX_USB=m
CONFIG_HAVE_IDE=y
@@ -3471,6 +3472,7 @@ CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PCIE=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
#
# WiMAX Wireless Broadband devices
@@ -5374,6 +5376,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_CEC_PIN_ERROR_INJ is not set
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_VIDEO_V4L2=m
@@ -7444,6 +7447,7 @@ CONFIG_MMC_MESON_MX_SDIO=m
CONFIG_MMC_SDHCI_ST=m
CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_ALCOR=m
CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_MXC=m
# CONFIG_MMC_TIFM_SD is not set
@@ -7782,6 +7786,7 @@ CONFIG_DMA_SUN4I=m
CONFIG_DMA_SUN6I=m
CONFIG_DW_AXI_DMAC=m
CONFIG_FSL_EDMA=m
+CONFIG_FSL_QDMA=m
CONFIG_IMX_DMA=m
CONFIG_IMX_SDMA=m
# CONFIG_INTEL_IDMA64 is not set
@@ -7974,6 +7979,7 @@ CONFIG_VIDEO_IMX_CSI=m
CONFIG_SOC_CAMERA_IMX074=m
CONFIG_SOC_CAMERA_MT9T031=m
# CONFIG_VIDEO_OMAP4 is not set
+CONFIG_VIDEO_ROCKCHIP_VPU=m
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_SUNXI_CEDRUS=m
CONFIG_TEGRA_VDE=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 0682edf676..d5cc0fe0b5 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -2390,6 +2390,7 @@ CONFIG_ECHO=m
# CONFIG_CXL_AFU_DRIVER_OPS is not set
# CONFIG_CXL_LIB is not set
# CONFIG_OCXL_BASE is not set
+CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_RTSX_PCI=m
CONFIG_MISC_RTSX_USB=m
CONFIG_HAVE_IDE=y
@@ -3495,6 +3496,7 @@ CONFIG_PCMCIA_RAYCS=m
CONFIG_PCMCIA_WL3501=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
#
# WiMAX Wireless Broadband devices
@@ -6671,6 +6673,7 @@ CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
# CONFIG_MMC_SDHCI_F_SDH30 is not set
CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_SPI=m
CONFIG_MMC_SDRICOH_CS=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index f9f29ee440..d610edc764 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -231,7 +231,6 @@ CONFIG_PPC_BOOK3S=y
CONFIG_PPC_FPU=y
CONFIG_ALTIVEC=y
CONFIG_VSX=y
-CONFIG_PPC_STD_MMU=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_PPC_RADIX_MMU=y
CONFIG_PPC_RADIX_MMU_DEFAULT=y
@@ -2019,6 +2018,7 @@ CONFIG_CXL_LIB=y
CONFIG_CXL=m
CONFIG_OCXL_BASE=y
CONFIG_OCXL=m
+CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_RTSX_PCI=m
CONFIG_MISC_RTSX_USB=m
CONFIG_HAVE_IDE=y
@@ -3110,6 +3110,7 @@ CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PCIE=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
#
# WiMAX Wireless Broadband devices
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 216799d3ab..d6ffe46da7 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -227,7 +227,6 @@ CONFIG_PPC_BOOK3S=y
CONFIG_PPC_FPU=y
CONFIG_ALTIVEC=y
CONFIG_VSX=y
-CONFIG_PPC_STD_MMU=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_PPC_RADIX_MMU=y
CONFIG_PPC_RADIX_MMU_DEFAULT=y
@@ -1925,6 +1924,7 @@ CONFIG_CXL_LIB=y
CONFIG_CXL=m
CONFIG_OCXL_BASE=y
CONFIG_OCXL=m
+CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_RTSX_PCI=m
CONFIG_MISC_RTSX_USB=m
CONFIG_HAVE_IDE=y
@@ -2989,6 +2989,7 @@ CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PCIE=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
#
# WiMAX Wireless Broadband devices
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index ec865ead3d..c5aa4011b4 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -2407,6 +2407,7 @@ CONFIG_ECHO=m
# CONFIG_CXL_AFU_DRIVER_OPS is not set
# CONFIG_CXL_LIB is not set
# CONFIG_OCXL_BASE is not set
+CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_RTSX_PCI=m
CONFIG_MISC_RTSX_USB=m
CONFIG_HAVE_IDE=y
@@ -3516,6 +3517,7 @@ CONFIG_PCMCIA_RAYCS=m
CONFIG_PCMCIA_WL3501=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
#
# WiMAX Wireless Broadband devices
@@ -6667,6 +6669,7 @@ CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
# CONFIG_MMC_SDHCI_F_SDH30 is not set
CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_SPI=m
CONFIG_MMC_SDRICOH_CS=m
diff --git a/rpm/config.sh b/rpm/config.sh
index b6b01952d1..b86f3aea61 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc5-next-20181205
+SRCVERSION=4.20-rc5-next-20181206
# 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