Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-01-21 12:04:50 +0100
committerKernel Build Daemon <kbuild@suse.de>2019-01-21 12:04:50 +0100
commit8f05dc9a229c596c72f3d71cec6bdc64180111fb (patch)
tree0b1b553f447315d6054bee72f5c8126d9b0fd27e
parent921b83bdec55fba30b8d21bb0605c0ad00ab5829 (diff)
Automatically updated to 5.0-rc2-next-20190121linux-next
-rw-r--r--config/arm64/vanilla3
-rw-r--r--config/armv7hl/vanilla4
-rw-r--r--config/i386/vanilla4
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla2
-rw-r--r--rpm/config.sh2
7 files changed, 10 insertions, 9 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 19ebb66685..fcb8c08bdc 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -2203,10 +2203,10 @@ CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_HISI_SFC=m
+CONFIG_SPI_MTK_QUADSPI=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -5979,6 +5979,7 @@ CONFIG_DRM_AMD_DC=y
# CONFIG_DRM_AMD_DC_DCN1_0 is not set
# CONFIG_DRM_AMD_DC_DCN1_01 is not set
# CONFIG_DEBUG_KERNEL_DC is not set
+CONFIG_HSA_AMD=y
#
# AMD Library routines
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index e164a89500..2f024a1b07 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -897,7 +897,7 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
# CONFIG_64BIT_TIME is not set
-# CONFIG_COMPAT_32BIT_TIME is not set
+CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
@@ -2304,10 +2304,10 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_LPDDR2_NVM=m
CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_HISI_SFC=m
+CONFIG_SPI_MTK_QUADSPI=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 7b2d9160f6..bde6755802 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -783,7 +783,7 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
# CONFIG_64BIT_TIME is not set
-# CONFIG_COMPAT_32BIT_TIME is not set
+CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
@@ -2197,8 +2197,8 @@ CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
# CONFIG_SPI_INTEL_SPI_PCI is not set
# CONFIG_SPI_INTEL_SPI_PLATFORM is not set
CONFIG_MTD_UBI=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 0179e15526..1ad4b1988b 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1841,8 +1841,8 @@ CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
# CONFIG_MTD_UBI is not set
CONFIG_DTC=y
CONFIG_OF=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index b08354bea0..d8b989b75d 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1747,8 +1747,8 @@ CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
# CONFIG_MTD_UBI is not set
CONFIG_DTC=y
CONFIG_OF=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 601e87d9dd..1419e91cc7 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -2206,8 +2206,8 @@ CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
# CONFIG_SPI_INTEL_SPI_PCI is not set
# CONFIG_SPI_INTEL_SPI_PLATFORM is not set
CONFIG_MTD_UBI=m
diff --git a/rpm/config.sh b/rpm/config.sh
index 8d96ebfd09..733c2759a4 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.0-rc2-next-20190118
+SRCVERSION=5.0-rc2-next-20190121
# 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