Index: releng/11.4/etc/mtree/BSD.include.dist
===================================================================
--- releng/11.4/etc/mtree/BSD.include.dist	(revision 361051)
+++ releng/11.4/etc/mtree/BSD.include.dist	(revision 361052)
@@ -1,358 +1,356 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     arpa
     ..
     atf-c
     ..
     atf-c++
     ..
     bsm
     ..
     bsnmp
     ..
     c++
         4.2
             backward
             ..
             bits
             ..
             debug
             ..
             ext
                 pb_ds
                     detail
                         basic_tree_policy
                         ..
                         bin_search_tree_
                         ..
                         binary_heap_
                         ..
                         binomial_heap_
                         ..
                         binomial_heap_base_
                         ..
                         cc_hash_table_map_
                         ..
                         eq_fn
                         ..
                         gp_hash_table_map_
                         ..
                         hash_fn
                         ..
                         left_child_next_sibling_heap_
                         ..
                         list_update_map_
                         ..
                         list_update_policy
                         ..
                         ov_tree_map_
                         ..
                         pairing_heap_
                         ..
                         pat_trie_
                         ..
                         rb_tree_map_
                         ..
                         rc_binomial_heap_
                         ..
                         resize_policy
                         ..
                         splay_tree_
                         ..
                         thin_heap_
                         ..
                         tree_policy
                         ..
                         trie_policy
                         ..
                         unordered_iterator
                         ..
                     ..
                 ..
             ..
             tr1
             ..
         ..
         v1
             experimental
             ..
             ext
             ..
             tr1
             ..
         ..
     ..
     cam
         ata
         ..
         nvme
         ..
         scsi
         ..
     ..
     casper
     ..
     crypto
     ..
     dev
         acpica
         ..
         agp
         ..
         an
         ..
         bktr
         ..
         ciss
         ..
         evdev
         ..
         filemon
         ..
         firewire
         ..
         hwpmc
         ..
         hyperv
         ..
         ic
         ..
         iicbus
         ..
         io
         ..
         lmc
         ..
         mfi
         ..
         mlx5
         ..
         mmc
         ..
         mpt
             mpilib
             ..
         ..
         nand
         ..
         nvme
         ..
         ofw
         ..
         pbio
         ..
         pci
         ..
         powermac_nvram
         ..
         ppbus
         ..
         smbus
         ..
         speaker
         ..
         usb
         ..
         utopia
         ..
         vkbd
         ..
         wi
         ..
     ..
     devdctl
     ..
     edit
         readline
         ..
     ..
     fs
         cuse
         ..
         devfs
         ..
         fdescfs
         ..
         msdosfs
         ..
         nandfs
         ..
         nfs
         ..
         nullfs
         ..
         procfs
         ..
         smbfs
         ..
         udf
         ..
         unionfs
         ..
     ..
     gcc
         4.2
         ..
     ..
     geom
         cache
         ..
         concat
         ..
         eli
         ..
         gate
         ..
         journal
         ..
         label
         ..
         mirror
         ..
         mountver
         ..
         multipath
         ..
         nop
         ..
         raid
         ..
         raid3
         ..
         shsec
         ..
         stripe
         ..
         virstor
         ..
     ..
     gnu
         posix
         ..
     ..
     gssapi
     ..
     infiniband
         complib 
         ..
         iba
         ..
         opensm
         ..
         vendor
         ..
     ..
     isofs
         cd9660
         ..
     ..
     kadm5
     ..
     krb5
     ..
     lib80211
     ..
     libmilter
     ..
     libxo
     ..
     lzma
     ..
     machine
         pc
         ..
     ..
     net
         altq
         ..
     ..
     net80211
     ..
     netgraph
         atm
         ..
         bluetooth
             include
             ..
         ..
         netflow
         ..
     ..
     netinet
         cc
         ..
     ..
     netinet6
     ..
     netipsec
     ..
     netnatm
         api
         ..
         msg
         ..
         saal
         ..
         sig
         ..
     ..
     netpfil
         pf
         ..
     ..
     netsmb
     ..
     nfs
     ..
     nfsclient
     ..
     nfsserver
     ..
     openssl
     ..
     pcap
     ..
     protocols
     ..
     rdma
     ..
     rpc
     ..
     rpcsvc
     ..
     security
         audit
         ..
         mac_biba
         ..
         mac_bsdextended
         ..
         mac_lomac
         ..
         mac_mls
         ..
         mac_partition
         ..
     ..
-    ssp
-    ..
     sys
     ..
     teken
     ..
     ufs
         ffs
         ..
         ufs
         ..
     ..
     vm
     ..
     xlocale
     ..
 ..
Index: releng/11.4
===================================================================
--- releng/11.4	(revision 361051)
+++ releng/11.4	(revision 361052)

Property changes on: releng/11.4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r357929
   Merged /stable/11:r361051