*** 240,250 ****
  DRV_KMODS       += dca
  DRV_KMODS       += devinfo
  DRV_KMODS       += dld
  DRV_KMODS       += dlpistub
  DRV_KMODS_32    += dnet
- DRV_KMODS       += dr_sas
  DRV_KMODS       += dump
  DRV_KMODS       += ecpp
  DRV_KMODS       += emlxs
  DRV_KMODS       += eventfd
  DRV_KMODS       += fd
--- 240,249 ----
*** 289,299 ****
  DRV_KMODS       += mouse8042
  DRV_KMODS       += mpt_sas
  DRV_KMODS       += mr_sas
  DRV_KMODS       += mwl 
  DRV_KMODS       += nca
- DRV_KMODS       += nfp
  DRV_KMODS       += nsmb
  DRV_KMODS       += nulldriver
  DRV_KMODS       += nv_sata
  DRV_KMODS       += nvme
  DRV_KMODS       += nxge
--- 288,297 ----
*** 359,370 ****
  DRV_KMODS       += ural
  DRV_KMODS       += uath
  DRV_KMODS       += urtw
  DRV_KMODS       += vgatext
  DRV_KMODS       += heci
- DRV_KMODS       += vmxnet 
- DRV_KMODS       += vnd
  DRV_KMODS       += vnic
  DRV_KMODS       += vscan
  DRV_KMODS       += wc
  DRV_KMODS       += winlock
  DRV_KMODS       += wpi
--- 357,366 ----
*** 372,382 ****
  DRV_KMODS       += yge
  DRV_KMODS       += zcons
  DRV_KMODS       += zfd
  DRV_KMODS       += zyd
  DRV_KMODS       += simnet
- DRV_KMODS       += smrt
  DRV_KMODS       += stmf
  DRV_KMODS       += stmf_sbd
  DRV_KMODS       += fct
  DRV_KMODS       += fcoe
  DRV_KMODS       += fcoet
--- 368,377 ----
*** 500,518 ****
  DRV_KMODS       += usbvc
  DRV_KMODS       += usbftdi
  DRV_KMODS       += usbecm
  
  #
- #       USBGEM modules
- #
- DRV_KMODS       += usbgem
- DRV_KMODS       += axf
- DRV_KMODS       += udmf 
- DRV_KMODS       += upf
- DRV_KMODS       += urf 
- 
- #
  #       1394 modules
  #
  MISC_KMODS      += s1394 sbp2
  DRV_KMODS       += hci1394 scsa1394
  DRV_KMODS       += av1394
--- 495,504 ----
*** 548,559 ****
  SCHED_KMODS     += IA RT TS RT_DPTBL TS_DPTBL FSS FX FX_DPTBL SDC
  
  #
  #       File System Modules (/kernel/fs):
  #
! FS_KMODS        += autofs ctfs dcfs dev devfs fdfs fifofs hsfs hyprlofs
! FS_KMODS        += lofs lxautofs lx_proc lxprocfs mntfs namefs nfs objfs zfs zut
  FS_KMODS        += pcfs procfs sockfs specfs tmpfs udfs ufs sharefs lx_sysfs
  FS_KMODS        += smbfs bootfs lx_cgroup lx_devfs
  
  #
  #       Streams Modules (/kernel/strmod):
--- 534,545 ----
  SCHED_KMODS     += IA RT TS RT_DPTBL TS_DPTBL FSS FX FX_DPTBL SDC
  
  #
  #       File System Modules (/kernel/fs):
  #
! FS_KMODS        += autofs ctfs dcfs dev devfs fdfs fifofs hsfs lofs
! FS_KMODS        += lxautofs lx_proc mntfs namefs nfs objfs zfs zut
  FS_KMODS        += pcfs procfs sockfs specfs tmpfs udfs ufs sharefs lx_sysfs
  FS_KMODS        += smbfs bootfs lx_cgroup lx_devfs
  
  #
  #       Streams Modules (/kernel/strmod):
*** 611,621 ****
  MISC_KMODS      += dls
  MISC_KMODS      += drm
  MISC_KMODS      += fssnap_if
  MISC_KMODS      += gda
  MISC_KMODS      += gld
- MISC_KMODS      += gsqueue
  MISC_KMODS      += hidparser
  MISC_KMODS      += hook
  MISC_KMODS      += hpcsvc
  MISC_KMODS      += ibcm
  MISC_KMODS      += ibdm
--- 597,606 ----
*** 728,750 ****
  MAC_KMODS       += mac_ipv6
  MAC_KMODS       += mac_wifi
  MAC_KMODS       += mac_ib
  
  #
- #       Overlay related modules (/kernel/overlay)
- #
- DRV_KMODS       += overlay
- OVERLAY_KMODS   += vxlan
- 
- #
  # socketmod (kernel/socketmod)
  #
  SOCKET_KMODS    += sockpfp
  SOCKET_KMODS    += socksctp
  SOCKET_KMODS    += socksdp
  SOCKET_KMODS    += sockrds
  SOCKET_KMODS    += ksslf
  SOCKET_KMODS    += datafilt
  
  #
  #       kiconv modules (/kernel/kiconv):
  #
--- 713,730 ----
  MAC_KMODS       += mac_ipv6
  MAC_KMODS       += mac_wifi
  MAC_KMODS       += mac_ib
  
  #
  # socketmod (kernel/socketmod)
  #
  SOCKET_KMODS    += sockpfp
  SOCKET_KMODS    += socksctp
  SOCKET_KMODS    += socksdp
  SOCKET_KMODS    += sockrds
  SOCKET_KMODS    += ksslf
+ SOCKET_KMODS    += httpfilt
  SOCKET_KMODS    += datafilt
  
  #
  #       kiconv modules (/kernel/kiconv):
  #