Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-06-15 12:02:13 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-06-15 12:02:13 +0200
commit71088235d9ee0808d8cdb8fe7fddb0a1ce8f8e59 (patch)
treeda276fcf90924584c311e1a01273b35fc1f839e8
parent1b1671f86d70cd2ea85f0eefab861a7a0a490a5f (diff)
Automatically updated to 5.2-rc4-next-20190614linux-next
-rw-r--r--config/arm64/vanilla1
-rw-r--r--config/armv7hl/vanilla3
-rw-r--r--config/ppc64/vanilla3
-rw-r--r--config/ppc64le/vanilla3
-rw-r--r--rpm/config.sh2
5 files changed, 11 insertions, 1 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 3853792b02..26fbc2955a 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -9350,6 +9350,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PMU_ACPI=y
CONFIG_ARM_SMMU_V3_PMU=m
CONFIG_ARM_DSU_PMU=m
+CONFIG_FSL_IMX8_DDR_PMU=m
CONFIG_HISI_PMU=y
CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index c0ce4ccb1b..8a278e5798 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -1046,7 +1046,9 @@ CONFIG_BINFMT_ELF_FDPIC=y
CONFIG_ELFCORE=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
# CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
@@ -9698,6 +9700,7 @@ CONFIG_ARM_CCI_PMU=m
# CONFIG_ARM_CCI5xx_PMU is not set
CONFIG_ARM_CCN=y
CONFIG_ARM_PMU=y
+CONFIG_FSL_IMX8_DDR_PMU=m
# end of Performance monitor support
CONFIG_RAS=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index b54f9222bc..390f353b18 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -2878,9 +2878,11 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
CONFIG_MDIO_MSCC_MIIM=m
# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
+CONFIG_PHYLINK=m
CONFIG_PHYLIB=m
CONFIG_SWPHY=y
CONFIG_LED_TRIGGER_PHY=y
@@ -2888,6 +2890,7 @@ CONFIG_LED_TRIGGER_PHY=y
#
# MII PHY device drivers
#
+CONFIG_SFP=m
CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AX88796B_PHY=m
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index bba8f1d39c..08dcb5d10d 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -2753,9 +2753,11 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
CONFIG_MDIO_MSCC_MIIM=m
# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
+CONFIG_PHYLINK=m
CONFIG_PHYLIB=m
CONFIG_SWPHY=y
CONFIG_LED_TRIGGER_PHY=y
@@ -2763,6 +2765,7 @@ CONFIG_LED_TRIGGER_PHY=y
#
# MII PHY device drivers
#
+CONFIG_SFP=m
CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AX88796B_PHY=m
diff --git a/rpm/config.sh b/rpm/config.sh
index b73516b3dd..0713e61d43 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.2-rc4-next-20190613
+SRCVERSION=5.2-rc4-next-20190614
# 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