diff --git a/debian/changelog b/debian/changelog
index eeae139e5..260615dd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,21 @@ linux (4.1.3-1) UNRELEASED; urgency=medium
   * [s390x] cachinfo: add missing facility check to init_cache_level()
     (Closes: #793929)
   * md: use kzalloc() when bitmap is disabled (CVE-2015-5697)
+  * inet: Enable IPVLAN, NET_FOU as modules; enable NET_FOU_IP_TUNNELS
+  * netfilter: Enable NFT_REDIR as module
+  * net/sched: Enable NET_ACT_VLAN, NET_ACT_BPF, NET_ACT_CONNMARK as modules
+  * mpls: Enable MPLS_ROUTING as module
+  * hci_uart: Enable BT_HCIUART_INTEL, BT_HCIUART_BCM
+  * SCSI: Enable SCSI_WD719X as module
+  * dm: Enable DM_LOG_WRITES as module
+  * cxgb4: Enable CHELSIO_T4_DCB
+  * ixgbe: Enable IXGBE_VXLAN
+  * i40e: Enable I40E_FCOE
+  * drm: Enable DRM_VGEM as module
+  * virtio: Enable VIRTIO_INPUT as module
+  * mmc: Enable MMC_TOSHIBA_PCI as module
+  * [x86] block: Enable BLK_DEV_PMEM as module; enable X86_PMEM_LEGACY
+  * [x86] tpm: Enable TCG_CRB as module
 
   [ Ian Campbell ]
   * [armhf] Set CONFIG_ARM_TEGRA_CPUFREQ as builtin.
diff --git a/debian/config/config b/debian/config/config
index 9aebc60a6..9162da6a8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -323,6 +323,8 @@ CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
 # CONFIG_BT_HCIBTUART is not set
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
@@ -504,6 +506,7 @@ CONFIG_GPIO_VIPERBOARD=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VGEM=m
 
 ##
 ## file: drivers/gpu/drm/ast/Kconfig
@@ -1457,6 +1460,7 @@ CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
 CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
 
 ##
 ## file: drivers/md/bcache/Kconfig
@@ -2312,6 +2316,7 @@ CONFIG_MMC_USHC=m
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_TOSHIBA_PCI=m
 
 ##
 ## file: drivers/mtd/Kconfig
@@ -2408,6 +2413,7 @@ CONFIG_EQUALIZER=m
 CONFIG_IFB=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
@@ -2587,6 +2593,7 @@ CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
 CONFIG_CHELSIO_T4VF=m
 
 ##
@@ -2657,6 +2664,7 @@ CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
+CONFIG_IXGBE_VXLAN=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
@@ -2664,6 +2672,7 @@ CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 CONFIG_I40E_VXLAN=y
 CONFIG_I40E_DCB=y
+CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
 
 ##
@@ -3616,6 +3625,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_IPR is not set
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_WD719X=m
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_PM8001=m
@@ -4519,6 +4529,7 @@ CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO is not set
 
 ##
@@ -5713,6 +5724,8 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
@@ -5881,6 +5894,7 @@ CONFIG_MAC80211_LEDS=y
 ##
 #. Can be built as a module, but nothing will trigger loading
 CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
 
 ##
 ## file: net/netfilter/Kconfig
@@ -5924,6 +5938,7 @@ CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_REJECT=m
@@ -6181,6 +6196,9 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
 CONFIG_NET_CLS_IND=y
 
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index fa8ae9e86..ff672ba58 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -41,6 +41,7 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_NODES_SHIFT=6
 # CONFIG_ARCH_MEMORY_PROBE is not set
+CONFIG_X86_PMEM_LEGACY=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
@@ -256,6 +257,7 @@ CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_PMEM=m
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -336,6 +338,7 @@ CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=m
 
 ##
 ## file: drivers/char/tpm/st33zp24/Kconfig