diff --git a/debian/changelog b/debian/changelog
index 9ab66ff51..b9ba46cb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -311,12 +311,29 @@ linux (4.2.5-1) UNRELEASED; urgency=medium
   * KEYS: Don't permit request_key() to construct a new keyring
 
   [ Ben Hutchings ]
-  * [x86] drm: Enable DRM_AMDGPU as module
+  * [x86] drm: Enable DRM_AMDGPU and HSA_AMD as modules (Closes: #797752)
   * media: Enable DVB_AS102, VIDEO_GO7007, VIDEO_GO7007_USB,
     VIDEO_GO7007_LOADER, VIDEO_GO7007_USB_S2250_BOARD as modules
-  * net: Enable LIQUIDIO as module
+  * net: Enable LIQUIDIO and MLX5_CORE as modules; enable MLX5_CORE_EN
   * [x86] Enable X86_AMD_PLATFORM_DEVICE
   * linux-manual: Fix regression in reproducibility in 4.2~rc8-1~exp1
+  * net: Enable GENEVE_CORE as module
+    - Re-enable GENEVE and OPENVSWITCH_GENEVE
+  * bpf: Enable BPF_SYSCALL
+  * ACPI: Enable ACPI_NFIT as module
+  * tcp: Enable TCP_CONG_CDG as module
+  * nftables: Enable NF_TABLES_NETDEV, NFT_REDIR_IPV4, NFT_REDIR_IPV6 as
+    modules
+  * net/sched: Enable NET_CLS_FLOWER as module
+  * SCSI: Enable SCSI_SNIC as module
+  * target: Enable TCM_USER2 as module
+  * net/phy: Enable DP83867_PHY as module
+  * drm: Enable DRM_VIRTIO_GPU as module
+  * HID: Enable HID_BETOP_FF, HID_PLANTRONICS as modules
+  * hwrng: Enable USB_CHAOSKEY as module
+  * ext4: Enable EXT4_ENCRYPTION
+  * f2fs: Enable F2FS_FS_ENCRYPTION
+  * vfs,nvdimm: Enable FS_DAX
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Mon, 19 Oct 2015 21:23:18 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 157efd747..0da26b18d 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -139,6 +139,7 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
 # CONFIG_PMIC_OPREGION is not set
 
 ##
@@ -562,6 +563,11 @@ CONFIG_DRM_QXL=m
 ##
 CONFIG_DRM_UDL=m
 
+##
+## file: drivers/gpu/drm/virtio/Kconfig
+##
+CONFIG_DRM_VIRTIO_GPU=m
+
 ##
 ## file: drivers/gpu/drm/vmwgfx/Kconfig
 ##
@@ -586,6 +592,7 @@ CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=y
+CONFIG_HID_BETOP_FF=m
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 CONFIG_HID_PRODIKEYS=m
@@ -632,6 +639,7 @@ CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
@@ -2718,6 +2726,12 @@ CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN_VXLAN=y
 CONFIG_MLX4_DEBUG=y
 
+##
+## file: drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+##
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+
 ##
 ## file: drivers/net/ethernet/micrel/Kconfig
 ##
@@ -2954,6 +2968,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
+CONFIG_DP83867_PHY=m
 #. Must only be enabled for specific flavours
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
@@ -3634,6 +3649,8 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
 # CONFIG_SCSI_PPA is not set
 # CONFIG_SCSI_IMM is not set
 # CONFIG_SCSI_IZIP_EPP16 is not set
@@ -4080,6 +4097,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
 
 ##
 ## file: drivers/target/iscsi/Kconfig
@@ -4316,6 +4334,7 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
 
 ##
 ## file: drivers/usb/misc/sisusbvga/Kconfig
@@ -4783,6 +4802,7 @@ CONFIG_EXT4_FS=m
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 
 ##
@@ -4793,6 +4813,7 @@ CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_FS_ENCRYPTION=y
 # CONFIG_F2FS_IO_TRACE is not set
 
 ##
@@ -5241,6 +5262,7 @@ CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
+CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
@@ -5738,6 +5760,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
 CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_GENEVE_CORE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -5761,6 +5784,7 @@ CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
 ## choice: Default TCP congestion control
 # CONFIG_DEFAULT_BIC is not set
 CONFIG_DEFAULT_CUBIC=y
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 25affba83..29d71a5bd 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -483,6 +483,11 @@ CONFIG_DRM_SIS=m
 # CONFIG_DRM_AMDGPU_CIK is not set
 CONFIG_DRM_AMDGPU_USERPTR=y
 
+##
+## file: drivers/gpu/drm/amd/amdkfd/Kconfig
+##
+CONFIG_HSA_AMD=m
+
 ##
 ## file: drivers/gpu/drm/ast/Kconfig
 ##
diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules
index 1f6eb4616..8d35548b2 100644
--- a/debian/installer/modules/nic-modules
+++ b/debian/installer/modules/nic-modules
@@ -45,7 +45,9 @@ ixgbe ?
 ixgbevf ?
 jme ?
 lance ?
+liquidio ?
 mlx4_en ?
+mlx5_core ?
 myri10ge ?
 natsemi
 ne ?
@@ -98,6 +100,7 @@ inet_lro ?
 broadcom ?
 cicada ?
 davicom ?
+dp83867 ?
 et1011c ?
 icplus ?
 lxt ?
diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules
index 5b3e566aa..987b88be9 100644
--- a/debian/installer/modules/scsi-modules
+++ b/debian/installer/modules/scsi-modules
@@ -13,6 +13,7 @@ qla1280 ?
 qlogicfas ?
 sg
 sim710 ?
+snic ?
 t128 ?
 u14-34f ?
 ultrastor ?