Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-05-11 12:02:54 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-05-11 12:02:54 +0200
commit3e7d2b5388baeb67616f0633e66768710384211e (patch)
tree56af5c24a7bb9b5c0d055e6f6ac7f8c3055a6955
parent775f8e3ff36cebaed1febb7cfeb1e28f05302f6b (diff)
Automatically updated to 5.1-9698-g1fb3b526df3b
-rw-r--r--config/arm64/vanilla9
-rw-r--r--config/armv7hl/vanilla4
-rw-r--r--config/ppc64/vanilla7
-rw-r--r--config/ppc64le/vanilla7
-rw-r--r--rpm/config.sh2
5 files changed, 27 insertions, 2 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index d0d60c05fd..64f46e16fa 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -4885,6 +4885,7 @@ CONFIG_SENSORS_MAX6650=m
CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_TC654=m
# CONFIG_SENSORS_MENF21BMC_HWMON is not set
# CONFIG_SENSORS_ADCXX is not set
@@ -5060,6 +5061,7 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
CONFIG_WDAT_WDT=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_MLX_WDT=m
# CONFIG_ARM_SP805_WATCHDOG is not set
CONFIG_ARM_SBSA_WATCHDOG=m
CONFIG_ARMADA_37XX_WATCHDOG=m
@@ -6300,6 +6302,7 @@ CONFIG_FB_METRONOME=m
CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_PRE_INIT_FB=y
CONFIG_FB_MX3=m
CONFIG_FB_MXS=m
# CONFIG_FB_SIMPLE is not set
@@ -8062,6 +8065,10 @@ CONFIG_CROS_EC_LIGHTBAR=m
CONFIG_CROS_EC_VBC=m
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_SYSFS=m
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_MLXBF_TMFIFO=m
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -8271,6 +8278,7 @@ CONFIG_MAILBOX=y
CONFIG_IMX_MBOX=m
CONFIG_PLATFORM_MHU=m
# CONFIG_PL320_MBOX is not set
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
CONFIG_ROCKCHIP_MBOX=y
# CONFIG_PCC is not set
# CONFIG_ALTERA_MBOX is not set
@@ -8937,6 +8945,7 @@ CONFIG_PWM_CROS_EC=m
CONFIG_PWM_HIBVT=m
CONFIG_PWM_IMX1=m
CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
CONFIG_PWM_LP3943=m
CONFIG_PWM_MESON=m
CONFIG_PWM_MTK_DISP=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index ca5d3ae364..648ac0172f 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -6307,7 +6307,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
CONFIG_FB_ARMCLCD=y
-CONFIG_PLAT_VERSATILE_CLCD=y
# CONFIG_FB_IMX is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ASILIANT is not set
@@ -6348,6 +6347,7 @@ CONFIG_FB_DA8XX=m
CONFIG_FB_VIRTUAL=m
CONFIG_FB_METRONOME=m
# CONFIG_FB_MB862XX is not set
+CONFIG_FB_PRE_INIT_FB=y
CONFIG_FB_MX3=m
CONFIG_FB_MXS=m
CONFIG_FB_SIMPLE=y
@@ -8392,6 +8392,7 @@ CONFIG_ARM_MHU=m
CONFIG_IMX_MBOX=m
CONFIG_PLATFORM_MHU=m
CONFIG_PL320_MBOX=y
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
CONFIG_OMAP2PLUS_MBOX=m
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
CONFIG_ROCKCHIP_MBOX=y
@@ -9101,6 +9102,7 @@ CONFIG_PWM_FSL_FTM=m
CONFIG_PWM_HIBVT=m
CONFIG_PWM_IMX1=m
CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
# CONFIG_PWM_LP3943 is not set
CONFIG_PWM_MESON=m
CONFIG_PWM_MTK_DISP=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index a4a93f268f..6eb89013c6 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -237,6 +237,11 @@ CONFIG_VSX=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_PPC_RADIX_MMU=y
CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+CONFIG_PPC_KUAP_DEBUG=y
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
CONFIG_PPC_MM_SLICES=y
CONFIG_PPC_HAVE_PMU_SUPPORT=y
@@ -480,6 +485,7 @@ CONFIG_PPC_COPRO_BASE=y
CONFIG_SCHED_SMT=y
CONFIG_PPC_DENORMALISATION=y
# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE=""
CONFIG_EXTRA_TARGETS=""
CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
CONFIG_SUSPEND=y
@@ -7472,6 +7478,7 @@ CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
CONFIG_XMON=y
# CONFIG_XMON_DEFAULT is not set
CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
CONFIG_DEBUGGER=y
CONFIG_BOOTX_TEXT=y
# CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 483751f148..cd8af22f04 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -233,6 +233,11 @@ CONFIG_VSX=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_PPC_RADIX_MMU=y
CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+CONFIG_PPC_KUAP_DEBUG=y
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
CONFIG_PPC_MM_SLICES=y
CONFIG_PPC_HAVE_PMU_SUPPORT=y
@@ -420,6 +425,7 @@ CONFIG_PPC_COPRO_BASE=y
CONFIG_SCHED_SMT=y
CONFIG_PPC_DENORMALISATION=y
# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE=""
CONFIG_EXTRA_TARGETS=""
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
@@ -7330,6 +7336,7 @@ CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
CONFIG_XMON=y
# CONFIG_XMON_DEFAULT is not set
CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
CONFIG_DEBUGGER=y
CONFIG_BOOTX_TEXT=y
# CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index 7c02f7174b..841c318b60 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.1-9365-g8ea5b2abd07e
+SRCVERSION=5.1-9698-g1fb3b526df3b
# 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