Index: head/include
===================================================================
--- head/include	(revision 298097)
+++ head/include	(revision 298098)

Property changes on: head/include
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,10 +0,0 ##
   Reverse-merged /projects/clang350-import/include:r274961-276476
   Reverse-merged /vendor/resolver/dist/include:r269610,269763
   Reverse-merged /projects/clang360-import/include:r277327-280030
   Reverse-merged /projects/clang370-import/include:r287506-288928
   Reverse-merged /projects/clang380-import/include:r292913-296412
   Reverse-merged /projects/clang-trunk/include:r283596-287505
   Reverse-merged /projects/collation/include:r286424-290491
   Reverse-merged /projects/mpsutil/include:r286179-290100
   Reverse-merged /user/ed/newcons/include:r219886-259016
   Reverse-merged /projects/building-blocks/include:r275142-275144
Index: head/sbin
===================================================================
--- head/sbin	(revision 298097)
+++ head/sbin	(revision 298098)

Property changes on: head/sbin
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/ipfw/sbin:r267383-272837
   Reverse-merged /projects/clang-sparc64/sbin:r262258-262612
   Reverse-merged /projects/clang-trunk/sbin:r283596-287505
   Reverse-merged /projects/building-blocks/sbin:r275306-275307,277670,277673
   Reverse-merged /projects/collation/sbin:r286424-290491
   Reverse-merged /projects/largeSMP/sbin:r221273-222812,222815-223757
   Reverse-merged /vendor/resolver/dist/sbin:r1540-186085
   Reverse-merged /projects/clang350-import/sbin:r274961-276476
   Reverse-merged /projects/clang360-import/sbin:r277327-280030
   Reverse-merged /projects/clang370-import/sbin:r287506-288928
   Reverse-merged /projects/clang380-import/sbin:r292913-296412
   Reverse-merged /projects/quota64/sbin:r184125-207707
   Reverse-merged /user/piso/sbin:r186725
   Reverse-merged /head/sbin:r2-3
   Reverse-merged /projects/mpsutil/sbin:r286179-290100
   Reverse-merged /user/ngie/bug203673/sbin:r289470-289489
   Reverse-merged /projects/zfsd/head/sbin:r266519,269993
   Reverse-merged /projects/multi-fibv6/head/sbin:r230929-231848
Index: head/share
===================================================================
--- head/share	(revision 298097)
+++ head/share	(revision 298098)

Property changes on: head/share
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,21 +0,0 ##
   Reverse-merged /projects/clang-sparc64/share:r262258-262612
   Reverse-merged /projects/pf/head/share:r263908
   Reverse-merged /projects/clang-trunk/share:r283596-287505
   Reverse-merged /projects/elftoolchain/share:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share:r230929-231848
   Reverse-merged /user/ngie/bug203673/share:r289470-289489
   Reverse-merged /projects/building-blocks/share:r275142-275144,275556,275558
   Reverse-merged /projects/collation/share:r286424-290491
   Reverse-merged /vendor/resolver/dist/share:r1540-186085
   Reverse-merged /projects/clang350-import/share:r274961-276476
   Reverse-merged /projects/clang360-import/share:r277327-280030
   Reverse-merged /projects/clang370-import/share:r287506-288928
   Reverse-merged /projects/quota64/share:r184125-207707
   Reverse-merged /projects/clang380-import/share:r292913-296412
   Reverse-merged /projects/release-embedded/share:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/share:r221273-222812,222815-223757
   Reverse-merged /projects/random_number_generator/share:r254613-256243
   Reverse-merged /projects/mpsutil/share:r286179-290100
   Reverse-merged /projects/head_mfi/share:r233621
   Reverse-merged /head/share/vt:r266839
   Reverse-merged /projects/lldb-r201577/share:r262185-262527
Index: head/sys
===================================================================
--- head/sys	(revision 298097)
+++ head/sys	(revision 298098)

Property changes on: head/sys
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,31 +0,0 ##
   Reverse-merged /projects/clang-trunk/sys:r283596-287505
   Reverse-merged /projects/largeSMP/sys:r221273-222812,222815-223757
   Reverse-merged /projects/collation/sys:r286424-290491
   Reverse-merged /user/mav/ata/sys:r189793-190578
   Reverse-merged /projects/head_mfi/sys:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620
   Reverse-merged /user/thompsa/usb/sys:r187190
   Reverse-merged /user/piso/ipfw/sys:r190918,190921,190923,190926
   Reverse-merged /user/piso/sys:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /projects/clang350-import/sys:r274961-276476
   Reverse-merged /projects/routing/sys:r274553,276712
   Reverse-merged /projects/clang360-import/sys:r277327-280030
   Reverse-merged /projects/clang370-import/sys:r287506-288928
   Reverse-merged /projects/clang380-import/sys:r292913-296412
   Reverse-merged /projects/quota64/sys:r184125-207707
   Reverse-merged /user/np/cxl_tuning/sys:r254336,254386,254736
   Reverse-merged /projects/random_number_generator/sys:r254613-256400
   Reverse-merged /projects/multi-fibv6/head/sys:r230929-231848
   Reverse-merged /projects/mpsutil/sys:r286179-290100
   Reverse-merged /user/ed/newcons/sys:r219886-259015
   Reverse-merged /projects/ipfw/sys:r267383-272837
   Reverse-merged /user/dfr/xenhvm/6/sys:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys:r188574-189614
   Reverse-merged /user/delphij/zfs-arc-rebase/sys:r281754
   Reverse-merged /projects/vnet/sys:r295220
   Reverse-merged /projects/clang-sparc64/sys:r262258-262612
   Reverse-merged /projects/cambria/sys:r186008-186350
   Reverse-merged /user/alfred/9-alfred/sys:r242488
   Reverse-merged /user/jimharris/isci/sys:r228377-230794
   Reverse-merged /user/peter/kinfo/sys:r185413-185547
   Reverse-merged /projects/cxl_iscsi/sys:r291227-291228,292618
   Reverse-merged /projects/pf/head/sys:r251993,263908,264198
Index: head/targets
===================================================================
--- head/targets	(revision 298097)
+++ head/targets	(revision 298098)

Property changes on: head/targets
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,27 +0,0 ##
   Reverse-merged /projects/release-arm64/targets:r281786,281788,281792
   Reverse-merged /projects/multi-fibv6/head/targets:r230929-231848
   Reverse-merged /projects/elftoolchain/targets:r260687-261245
   Reverse-merged /projects/ipfw/targets:r267383-272837
   Reverse-merged /user/ngie/more-tests/targets:r281427-281428,281430,281432,281450,281460,281464-281465,281485,281489-281491,281515,281519,281589,281593-281597,281619
   Reverse-merged /projects/pf/head/targets:r263908
   Reverse-merged /projects/elftoolchain-update-r3130/targets:r276164,276167,276170-276172
   Reverse-merged /projects/clang-trunk/targets:r284648-287505
   Reverse-merged /projects/building-blocks/targets:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673
   Reverse-merged /user/delphij/zfs-arc-rebase/targets:r281754
   Reverse-merged /projects/zfsd/head/targets:r266519,269993
   Reverse-merged /projects/release-embedded/targets:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /vendor/resolver/dist/targets:r1540-186085
   Reverse-merged /projects/clang350-import/targets:r274961-275126,275128-275133,275135-276476
   Reverse-merged /projects/largeSMP/targets:r221273-222812,222815-223757
   Reverse-merged /projects/clang360-import/targets:r277327-280030
   Reverse-merged /projects/clang370-import/targets:r287506-288928
   Reverse-merged /projects/head_mfi/targets:r233621
   Reverse-merged /projects/clang380-import/targets:r292913-296412
   Reverse-merged /projects/quota64/targets:r184125-207707
   Reverse-merged /projects/clang-sparc64/targets:r262258-262612
   Reverse-merged /projects/random_number_generator/targets:r254613-256243
   Reverse-merged /projects/mpsutil/targets:r286179-290100
   Reverse-merged /head/targets:r236425-283348,283596-284187
   Reverse-merged /projects/lldb-r201577/targets:r262185-262527
   Reverse-merged /projects/collation/targets:r286424-290491
   Reverse-merged /projects/release-arm-redux/targets:r278203,278595-278597,278610,280643-280650,280652,280655,282539-282546,282548,282553-282557,282564,282566,282570,282573,282587-282593,282596-282607,282615-282616,282624-282629,282631,282633,282635-282640,282642,282647-282648,282653-282654,282656-282657,282659,282662-282667,282682,282691
Index: head/usr.bin/calendar
===================================================================
--- head/usr.bin/calendar	(revision 298097)
+++ head/usr.bin/calendar	(revision 298098)

Property changes on: head/usr.bin/calendar
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,12 +0,0 ##
   Reverse-merged /projects/clang350-import/usr.bin/calendar:r274961-276476
   Reverse-merged /vendor/resolver/dist/usr.bin/calendar:r1540-186085
   Reverse-merged /projects/clang360-import/usr.bin/calendar:r277327-280030
   Reverse-merged /projects/collation/usr.bin/calendar:r286424-290491
   Reverse-merged /user/edwin/calendar:r211781,211834-211835
   Reverse-merged /projects/clang370-import/usr.bin/calendar:r287506-288928
   Reverse-merged /projects/clang380-import/usr.bin/calendar:r292913-296412
   Reverse-merged /projects/quota64/usr.bin/calendar:r184125-207707
   Reverse-merged /projects/clang-trunk/usr.bin/calendar:r283596-287505
   Reverse-merged /projects/mpsutil/usr.bin/calendar:r286179-290100
   Reverse-merged /projects/largeSMP/usr.bin/calendar:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/usr.bin/calendar:r230929-231848
Index: head/usr.bin/colldef
===================================================================
--- head/usr.bin/colldef	(revision 298097)
+++ head/usr.bin/colldef	(revision 298098)

Property changes on: head/usr.bin/colldef
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,28 +0,0 ##
   Reverse-merged /projects/clang370-import/usr.bin/colldef:r287506-288928
   Reverse-merged /projects/quota64/usr.bin/colldef:r184125-207707
   Reverse-merged /projects/pms/usr.bin/colldef:r285199-285661
   Reverse-merged /projects/clang380-import/usr.bin/colldef:r292913-296412
   Reverse-merged /projects/ipfw/usr.bin/colldef:r267383-272837
   Reverse-merged /user/ngie/more-tests2/usr.bin/colldef:r288935-289179,289223-289224,289226-289227,289230,289236,289325,289437,289440,289484-289486
   Reverse-merged /projects/zfsd/head/usr.bin/colldef:r266519,269993
   Reverse-merged /projects/random_number_generator/usr.bin/colldef:r254613-256243
   Reverse-merged /projects/mpsutil/usr.bin/colldef:r286179-290100
   Reverse-merged /projects/clang-sparc64/usr.bin/colldef:r262258-262612
   Reverse-merged /projects/release-embedded/usr.bin/colldef:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/usr.bin/colldef:r221273-222812,222815-223757
   Reverse-merged /projects/head_mfi/usr.bin/colldef:r233621
   Reverse-merged /user/ngie/more-tests/usr.bin/colldef:r281427-281428,281430,281432,281450,281460,281464-281465,281485,281489-281491,281515,281519,281589,281593-281597,281619,284388,288316,288321-288327,288422,288476,288478-288481,288483,288578,288650-288651,288655-288656,288659-288661,288663,288673-288676,288680,288828,288930-288932
   Reverse-merged /projects/pf/head/usr.bin/colldef:r263908
   Reverse-merged /projects/clang-trunk/usr.bin/colldef:r283596-287505
   Reverse-merged /projects/release-arm-redux/usr.bin/colldef:r278203,278595-278597,278610,280643-280650,280652,280655,282539-282546,282548,282553-282557,282564,282566,282570,282573,282587-282593,282596-282607,282615-282616,282624-282629,282631,282633,282635-282640,282642,282647-282648,282653-282654,282656-282657,282659,282662-282667,282682,282691
   Reverse-merged /projects/building-blocks/usr.bin/colldef:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673
   Reverse-merged /projects/release-arm64/usr.bin/colldef:r281786,281788,281792
   Reverse-merged /projects/lldb-r201577/usr.bin/colldef:r262185-262527
   Reverse-merged /projects/elftoolchain-update-r3130/usr.bin/colldef:r276164,276167,276170-276172
   Reverse-merged /user/delphij/zfs-arc-rebase/usr.bin/colldef:r281754
   Reverse-merged /user/ngie/bug203673/usr.bin/colldef:r289470-289489
   Reverse-merged /projects/clang350-import/usr.bin/colldef:r274961-275126,275128-275133,275135-276476
   Reverse-merged /vendor/resolver/dist/usr.bin/colldef:r1540-186085
   Reverse-merged /projects/multi-fibv6/head/usr.bin/colldef:r230929-231848
   Reverse-merged /projects/elftoolchain/usr.bin/colldef:r260687-261245
   Reverse-merged /projects/clang360-import/usr.bin/colldef:r277327-280030
Index: head/usr.bin/mkimg
===================================================================
--- head/usr.bin/mkimg	(revision 298097)
+++ head/usr.bin/mkimg	(revision 298098)

Property changes on: head/usr.bin/mkimg
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +0,0 ##
   Reverse-merged /projects/clang-trunk/usr.bin/mkimg:r283596-287505
   Reverse-merged /projects/collation/usr.bin/mkimg:r286424-290491
   Reverse-merged /projects/mpsutil/usr.bin/mkimg:r286179-290100
   Reverse-merged /projects/clang350-import/usr.bin/mkimg:r274961-276476
   Reverse-merged /user/marcel/mkimg:r263918-272381
   Reverse-merged /projects/clang360-import/usr.bin/mkimg:r277327-280030
   Reverse-merged /projects/clang370-import/usr.bin/mkimg:r287506-288928
Index: head/usr.bin/mklocale
===================================================================
--- head/usr.bin/mklocale	(revision 298097)
+++ head/usr.bin/mklocale	(revision 298098)

Property changes on: head/usr.bin/mklocale
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,28 +0,0 ##
   Reverse-merged /user/ngie/more-tests/usr.bin/mklocale:r281427-281428,281430,281432,281450,281460,281464-281465,281485,281489-281491,281515,281519,281589,281593-281597,281619,284388,288316,288321-288327,288422,288476,288478-288481,288483,288578,288650-288651,288655-288656,288659-288661,288663,288673-288676,288680,288828,288930-288932
   Reverse-merged /projects/pf/head/usr.bin/mklocale:r263908
   Reverse-merged /projects/clang-trunk/usr.bin/mklocale:r283596-287505
   Reverse-merged /projects/elftoolchain/usr.bin/mklocale:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/usr.bin/mklocale:r230929-231848
   Reverse-merged /projects/building-blocks/usr.bin/mklocale:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673
   Reverse-merged /projects/ipfw/usr.bin/mklocale:r267383-272837
   Reverse-merged /user/ngie/more-tests2/usr.bin/mklocale:r288935-289179,289223-289224,289226-289227,289230,289236,289325,289437,289440,289484-289486
   Reverse-merged /projects/release-arm-redux/usr.bin/mklocale:r278203,278595-278597,278610,280643-280650,280652,280655,282539-282546,282548,282553-282557,282564,282566,282570,282573,282587-282593,282596-282607,282615-282616,282624-282629,282631,282633,282635-282640,282642,282647-282648,282653-282654,282656-282657,282659,282662-282667,282682,282691
   Reverse-merged /projects/release-arm64/usr.bin/mklocale:r281786,281788,281792
   Reverse-merged /vendor/resolver/dist/usr.bin/mklocale:r1540-186085
   Reverse-merged /projects/clang350-import/usr.bin/mklocale:r274961-275126,275128-275133,275135-276476
   Reverse-merged /projects/clang360-import/usr.bin/mklocale:r277327-280030
   Reverse-merged /projects/elftoolchain-update-r3130/usr.bin/mklocale:r276164,276167,276170-276172
   Reverse-merged /projects/clang370-import/usr.bin/mklocale:r287506-288928
   Reverse-merged /projects/clang380-import/usr.bin/mklocale:r292913-296412
   Reverse-merged /projects/pms/usr.bin/mklocale:r285199-285661
   Reverse-merged /projects/quota64/usr.bin/mklocale:r184125-207707
   Reverse-merged /projects/release-embedded/usr.bin/mklocale:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/usr.bin/mklocale:r221273-222812,222815-223757
   Reverse-merged /projects/random_number_generator/usr.bin/mklocale:r254613-256243
   Reverse-merged /projects/mpsutil/usr.bin/mklocale:r286179-290100
   Reverse-merged /projects/head_mfi/usr.bin/mklocale:r233621
   Reverse-merged /projects/zfsd/head/usr.bin/mklocale:r266519,269993
   Reverse-merged /projects/lldb-r201577/usr.bin/mklocale:r262185-262527
   Reverse-merged /projects/clang-sparc64/usr.bin/mklocale:r262258-262612
   Reverse-merged /user/delphij/zfs-arc-rebase/usr.bin/mklocale:r281754
   Reverse-merged /user/ngie/bug203673/usr.bin/mklocale:r289470-289489
Index: head/usr.bin/procstat
===================================================================
--- head/usr.bin/procstat	(revision 298097)
+++ head/usr.bin/procstat	(revision 298098)

Property changes on: head/usr.bin/procstat
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,11 +0,0 ##
   Reverse-merged /projects/clang370-import/usr.bin/procstat:r287506-288928
   Reverse-merged /user/peter/kinfo/usr.bin/procstat:r185413-185545
   Reverse-merged /projects/clang380-import/usr.bin/procstat:r292913-296412
   Reverse-merged /projects/quota64/usr.bin/procstat:r184125-207707
   Reverse-merged /projects/clang-trunk/usr.bin/procstat:r283596-287505
   Reverse-merged /projects/collation/usr.bin/procstat:r286424-290491
   Reverse-merged /head/usr.bin/procstat:r2-174198
   Reverse-merged /projects/mpsutil/usr.bin/procstat:r286179-290100
   Reverse-merged /projects/largeSMP/usr.bin/procstat:r221273-222812,222815-223757
   Reverse-merged /projects/clang350-import/usr.bin/procstat:r274961-276476
   Reverse-merged /projects/clang360-import/usr.bin/procstat:r277327-280030
Index: head/usr.sbin/bhyve
===================================================================
--- head/usr.sbin/bhyve	(revision 298097)
+++ head/usr.sbin/bhyve	(revision 298098)

Property changes on: head/usr.sbin/bhyve
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,14 +0,0 ##
   Reverse-merged /projects/clang350-import/usr.sbin/bhyve:r274961-276476
   Reverse-merged /projects/collation/usr.sbin/bhyve:r286424-290491
   Reverse-merged /vendor/resolver/dist/usr.sbin/bhyve:r1540-186085
   Reverse-merged /projects/clang360-import/usr.sbin/bhyve:r277327-280030
   Reverse-merged /projects/clang370-import/usr.sbin/bhyve:r287506-288928
   Reverse-merged /projects/clang380-import/usr.sbin/bhyve:r292913-296412
   Reverse-merged /projects/quota64/usr.sbin/bhyve:r184125-207707
   Reverse-merged /projects/largeSMP/usr.sbin/bhyve:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/usr.sbin/bhyve:r230929-231848
   Reverse-merged /projects/clang-trunk/usr.sbin/bhyve:r283596-287505
   Reverse-merged /head/usr.sbin/bhyve:r221906-245542
   Reverse-merged /projects/head_mfi/usr.sbin/bhyve:r233621
   Reverse-merged /projects/mpsutil/usr.sbin/bhyve:r286179-290100
   Reverse-merged /projects/clang-sparc64/usr.sbin/bhyve:r262258-262612
Index: head/usr.sbin/bhyvectl
===================================================================
--- head/usr.sbin/bhyvectl	(revision 298097)
+++ head/usr.sbin/bhyvectl	(revision 298098)

Property changes on: head/usr.sbin/bhyvectl
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,12 +0,0 ##
   Reverse-merged /head/usr.sbin/bhyvectl:r221906-245542
   Reverse-merged /projects/mpsutil/usr.sbin/bhyvectl:r286179-290100
   Reverse-merged /projects/largeSMP/usr.sbin/bhyvectl:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/usr.sbin/bhyvectl:r230929-231848
   Reverse-merged /projects/head_mfi/usr.sbin/bhyvectl:r233621
   Reverse-merged /projects/clang350-import/usr.sbin/bhyvectl:r274961-276476
   Reverse-merged /vendor/resolver/dist/usr.sbin/bhyvectl:r1540-186085
   Reverse-merged /projects/clang370-import/usr.sbin/bhyvectl:r287506-288928
   Reverse-merged /projects/clang380-import/usr.sbin/bhyvectl:r292913-296412
   Reverse-merged /projects/quota64/usr.sbin/bhyvectl:r184125-207707
   Reverse-merged /projects/collation/usr.sbin/bhyvectl:r286424-290491
   Reverse-merged /projects/clang-trunk/usr.sbin/bhyvectl:r283596-287505
Index: head/usr.sbin/bhyveload
===================================================================
--- head/usr.sbin/bhyveload	(revision 298097)
+++ head/usr.sbin/bhyveload	(revision 298098)

Property changes on: head/usr.sbin/bhyveload
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,13 +0,0 ##
   Reverse-merged /projects/clang350-import/usr.sbin/bhyveload:r274961-276476
   Reverse-merged /vendor/resolver/dist/usr.sbin/bhyveload:r1540-186085
   Reverse-merged /projects/clang-sparc64/usr.sbin/bhyveload:r262258-262612
   Reverse-merged /projects/clang370-import/usr.sbin/bhyveload:r287506-288928
   Reverse-merged /projects/clang380-import/usr.sbin/bhyveload:r292913-296412
   Reverse-merged /projects/largeSMP/usr.sbin/bhyveload:r221273-222812,222815-223757
   Reverse-merged /projects/quota64/usr.sbin/bhyveload:r184125-207707
   Reverse-merged /projects/multi-fibv6/head/usr.sbin/bhyveload:r230929-231848
   Reverse-merged /projects/clang-trunk/usr.sbin/bhyveload:r283596-287505
   Reverse-merged /projects/head_mfi/usr.sbin/bhyveload:r233621
   Reverse-merged /head/usr.sbin/bhyveload:r221906-245542
   Reverse-merged /projects/mpsutil/usr.sbin/bhyveload:r286179-290100
   Reverse-merged /projects/collation/usr.sbin/bhyveload:r286424-290491
Index: head/usr.sbin/jail
===================================================================
--- head/usr.sbin/jail	(revision 298097)
+++ head/usr.sbin/jail	(revision 298098)

Property changes on: head/usr.sbin/jail
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,13 +0,0 ##
   Reverse-merged /projects/mpsutil/usr.sbin/jail:r286179-290100
   Reverse-merged /projects/collation/usr.sbin/jail:r286424-290491
   Reverse-merged /projects/largeSMP/usr.sbin/jail:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/usr.sbin/jail:r230929-231848
   Reverse-merged /projects/head_mfi/usr.sbin/jail:r233621
   Reverse-merged /projects/clang350-import/usr.sbin/jail:r274961-276476
   Reverse-merged /vendor/resolver/dist/usr.sbin/jail:r1540-186085
   Reverse-merged /projects/clang360-import/usr.sbin/jail:r277327-280030
   Reverse-merged /projects/clang370-import/usr.sbin/jail:r287506-288928
   Reverse-merged /projects/jailconf/usr.sbin/jail:r214085-232242
   Reverse-merged /projects/clang380-import/usr.sbin/jail:r292913-296412
   Reverse-merged /projects/quota64/usr.sbin/jail:r184125-207707
   Reverse-merged /projects/clang-trunk/usr.sbin/jail:r283596-287505
Index: head/usr.sbin/ndiscvt
===================================================================
--- head/usr.sbin/ndiscvt	(revision 298097)
+++ head/usr.sbin/ndiscvt	(revision 298098)

Property changes on: head/usr.sbin/ndiscvt
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,10 +0,0 ##
   Reverse-merged /projects/clang-trunk/usr.sbin/ndiscvt:r283596-287505
   Reverse-merged /projects/mpsutil/usr.sbin/ndiscvt:r286179-290100
   Reverse-merged /projects/largeSMP/usr.sbin/ndiscvt:r221273-222812,222815-223757
   Reverse-merged /projects/collation/usr.sbin/ndiscvt:r286424-290491
   Reverse-merged /projects/clang350-import/usr.sbin/ndiscvt:r274961-276476
   Reverse-merged /vendor/resolver/dist/usr.sbin/ndiscvt:r1540-186085
   Reverse-merged /projects/clang370-import/usr.sbin/ndiscvt:r287506-288928
   Reverse-merged /projects/clang380-import/usr.sbin/ndiscvt:r292913-296412
   Reverse-merged /projects/quota64/usr.sbin/ndiscvt:r184125-207707
   Reverse-merged /projects/binutils-2.17/usr.sbin/ndiscvt:r213992-218818
Index: head/usr.sbin/rtadvctl
===================================================================
--- head/usr.sbin/rtadvctl	(revision 298097)
+++ head/usr.sbin/rtadvctl	(revision 298098)

Property changes on: head/usr.sbin/rtadvctl
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,6 +0,0 ##
   Reverse-merged /projects/clang-trunk/usr.sbin/rtadvctl:r283596-287505
   Reverse-merged /projects/collation/usr.sbin/rtadvctl:r286424-290491
   Reverse-merged /projects/mpsutil/usr.sbin/rtadvctl:r286179-290100
   Reverse-merged /user/hrs/ipv6/usr.sbin/rtadvctl:r224015,224052-224055,224087,224128,224210,224305,224619
   Reverse-merged /projects/clang350-import/usr.sbin/rtadvctl:r274961-276476
   Reverse-merged /projects/clang370-import/usr.sbin/rtadvctl:r287506-288928
Index: head/usr.sbin/rtadvd
===================================================================
--- head/usr.sbin/rtadvd	(revision 298097)
+++ head/usr.sbin/rtadvd	(revision 298098)

Property changes on: head/usr.sbin/rtadvd
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,9 +0,0 ##
   Reverse-merged /projects/quota64/usr.sbin/rtadvd:r184125-207707
   Reverse-merged /user/hrs/ipv6/usr.sbin/rtadvd:r223150,224006,224015,224018,224052-224053,224055,224064,224087,224101,224303-224304,224619-224620,225148-225149
   Reverse-merged /projects/clang-trunk/usr.sbin/rtadvd:r283596-287505
   Reverse-merged /projects/largeSMP/usr.sbin/rtadvd:r221273-222812,222815-223757
   Reverse-merged /projects/mpsutil/usr.sbin/rtadvd:r286179-290100
   Reverse-merged /projects/clang350-import/usr.sbin/rtadvd:r274961-276476
   Reverse-merged /vendor/resolver/dist/usr.sbin/rtadvd:r1540-186085
   Reverse-merged /projects/clang370-import/usr.sbin/rtadvd:r287506-288928
   Reverse-merged /projects/collation/usr.sbin/rtadvd:r286424-290491
Index: head/usr.sbin/rtsold
===================================================================
--- head/usr.sbin/rtsold	(revision 298097)
+++ head/usr.sbin/rtsold	(revision 298098)

Property changes on: head/usr.sbin/rtsold
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,10 +0,0 ##
   Reverse-merged /projects/collation/usr.sbin/rtsold:r286424-290491
   Reverse-merged /user/hrs/ipv6/usr.sbin/rtsold:r223149,225150
   Reverse-merged /projects/clang350-import/usr.sbin/rtsold:r274961-276476
   Reverse-merged /projects/largeSMP/usr.sbin/rtsold:r221273-222812,222815-223757
   Reverse-merged /vendor/resolver/dist/usr.sbin/rtsold:r1540-186085
   Reverse-merged /projects/clang370-import/usr.sbin/rtsold:r287506-288928
   Reverse-merged /projects/clang380-import/usr.sbin/rtsold:r292913-296412
   Reverse-merged /projects/quota64/usr.sbin/rtsold:r184125-207707
   Reverse-merged /projects/clang-trunk/usr.sbin/rtsold:r283596-287505
   Reverse-merged /projects/mpsutil/usr.sbin/rtsold:r286179-290100
Index: head/usr.sbin/zic
===================================================================
--- head/usr.sbin/zic	(revision 298097)
+++ head/usr.sbin/zic	(revision 298098)

Property changes on: head/usr.sbin/zic
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,10 +0,0 ##
   Reverse-merged /projects/clang370-import/usr.sbin/zic:r287506-288928
   Reverse-merged /projects/quota64/usr.sbin/zic:r184125-207707
   Reverse-merged /projects/clang-trunk/usr.sbin/zic:r283596-287505
   Reverse-merged /projects/mpsutil/usr.sbin/zic:r286179-290100
   Reverse-merged /vendor/tzcode/dist/zic:r195794,200830
   Reverse-merged /projects/collation/usr.sbin/zic:r286424-290491
   Reverse-merged /vendor/tzcode:r2703-183403
   Reverse-merged /projects/largeSMP/usr.sbin/zic:r221273-222812,222815-223757
   Reverse-merged /vendor/tzcode/dist:r198828
   Reverse-merged /projects/clang350-import/usr.sbin/zic:r274961-276476