Merge branch 'master' of salsa.debian.org:kernel-team/linux

Move extra changelog entries under 4.16~rc5-1~exp1 to the next version.

debian/changelog

@@ -1,3 +1,14 @@
+linux (4.16~rc5-1~exp2) UNRELEASED; urgency=medium
+
+  [ Uwe Kleine-König ]
+  * [arm64] enable various drivers as module for teres-i OSHW laptop
+    (Closes: #892786)
+
+  [ Helge Deller ]
+  * [hppa] Re-enable 32-bit SMP kernel build. Qemu now supports it.
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 13 Mar 2018 16:12:54 +0000
+
 linux (4.16~rc5-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate

debian/config/arm64/config

@@ -330,6 +330,8 @@ CONFIG_I2C_XGENE_SLIMPRO=m
 ##
 ## file: drivers/iio/adc/Kconfig
 ##
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 
@@ -344,6 +346,7 @@ CONFIG_KEYBOARD_TEGRA=m
 ##
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PM8941_PWRKEY=m
+CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_HISI_POWERKEY=m
 
@@ -364,6 +367,7 @@ CONFIG_QCOM_IRQ_COMBINER=y
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_PWM=m
 
 ##
 ## file: drivers/mailbox/Kconfig
@@ -387,6 +391,7 @@ CONFIG_TEGRA_MC=y
 ##
 ## file: drivers/mfd/Kconfig
 ##
+CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
@@ -713,6 +718,7 @@ CONFIG_PHY_TEGRA_XUSB=m
 ##
 ## file: drivers/pinctrl/Kconfig
 ##
+CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_MAX77620=y
@@ -751,6 +757,10 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 ## file: drivers/power/supply/Kconfig
 ##
 CONFIG_BATTERY_BQ27XXX=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_CHARGER_QCOM_SMBB=m
 
 ##
@@ -760,6 +770,7 @@ CONFIG_PWM=y
 CONFIG_PWM_BCM2835=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SUN4I=m
 CONFIG_PWM_TEGRA=m
 
 ##
@@ -767,6 +778,7 @@ CONFIG_PWM_TEGRA=m
 ##
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_AXP20X=m
 CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_HI655X=m
@@ -1021,6 +1033,7 @@ CONFIG_VFIO_PCI=m
 ## file: drivers/video/backlight/Kconfig
 ##
 CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_LP855X=m
 
 ##
@@ -1042,6 +1055,7 @@ CONFIG_GPIO_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
 CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
 CONFIG_MESON_GXBB_WATCHDOG=m

debian/config/hppa/defines

@@ -1,5 +1,5 @@
 [base]
-flavours: parisc parisc64-smp
+flavours: parisc parisc-smp parisc64-smp
 kernel-arch: parisc
 
 [build]
@@ -15,6 +15,10 @@ install-stem: vmlinux
 hardware: 32-bit PA-RISC
 hardware-long: HP PA-RISC 32-bit systems with max 4 GB RAM
 
+[parisc-smp_description]
+hardware: multiprocessor 32-bit PA-RISC
+hardware-long: HP PA-RISC 32-bit SMP systems with max 4 GB RAM
+
 [parisc64-smp_base]
 cflags: -fno-cse-follow-jumps
 override-host-type: hppa64-linux-gnu