Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-05-13 12:04:27 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-05-13 12:04:27 +0200
commit44a17b84deb3226fbd28269c4b80a372bc80ccc4 (patch)
tree4873f3d39141253e7ab17711d419619e50d9dad2
parent0572ad45005e8648609b25924263eb1fb52c12ab (diff)
Automatically updated to 5.1-next-20190513
-rw-r--r--config/arm64/vanilla2
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--config/ppc64/vanilla3
-rw-r--r--config/ppc64le/vanilla3
-rw-r--r--rpm/config.sh2
5 files changed, 9 insertions, 3 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 8dd747314e..7691836375 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -4470,6 +4470,7 @@ CONFIG_PINCTRL_MCP23S08=m
CONFIG_PINCTRL_ROCKCHIP=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
CONFIG_PINCTRL_MAX77620=m
CONFIG_PINCTRL_RK805=m
CONFIG_PINCTRL_OCELOT=y
@@ -4965,6 +4966,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
CONFIG_HISI_THERMAL=m
CONFIG_IMX_THERMAL=m
CONFIG_MAX77620_THERMAL=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 33560c4dee..584f3e95ee 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -4417,6 +4417,7 @@ CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_SIRF=y
CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_ST=y
+CONFIG_PINCTRL_STMFX=m
CONFIG_PINCTRL_PALMAS=y
CONFIG_PINCTRL_ZYNQ=y
CONFIG_PINCTRL_RK805=m
@@ -4966,6 +4967,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
# CONFIG_HISI_THERMAL is not set
CONFIG_IMX_THERMAL=m
CONFIG_QORIQ_THERMAL=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 6e7ab1f467..30a605aa51 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -3897,6 +3897,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_STMFX=m
CONFIG_PINCTRL_OCELOT=y
CONFIG_PINCTRL_LOCHNAGAR=m
CONFIG_PINCTRL_MADERA=m
@@ -4039,7 +4040,6 @@ CONFIG_CHARGER_BQ25890=m
CONFIG_CHARGER_SMB347=m
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
CONFIG_CHARGER_RT9455=m
-CONFIG_CHARGER_UCS1002=m
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4204,6 +4204,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
# CONFIG_QORIQ_THERMAL is not set
# CONFIG_DA9062_THERMAL is not set
CONFIG_WATCHDOG=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 6532733d44..da08a69753 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -3768,6 +3768,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_STMFX=m
CONFIG_PINCTRL_OCELOT=y
CONFIG_PINCTRL_LOCHNAGAR=m
CONFIG_PINCTRL_MADERA=m
@@ -3910,7 +3911,6 @@ CONFIG_CHARGER_BQ25890=m
CONFIG_CHARGER_SMB347=m
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
CONFIG_CHARGER_RT9455=m
-CONFIG_CHARGER_UCS1002=m
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4075,6 +4075,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
# CONFIG_QORIQ_THERMAL is not set
# CONFIG_DA9062_THERMAL is not set
CONFIG_WATCHDOG=y
diff --git a/rpm/config.sh b/rpm/config.sh
index 7e33349668..5135d038a0 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.1-next-20190510
+SRCVERSION=5.1-next-20190513
# 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