Index: projects/release-pkg/contrib/ipfilter/ml_ipl.c
===================================================================
--- projects/release-pkg/contrib/ipfilter/ml_ipl.c	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter/ml_ipl.c	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter/ml_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/ipfilter/ml_ipl.c:r274961-276476
   Reverse-merged /projects/collation/contrib/ipfilter/ml_ipl.c:r286424-290491
   Reverse-merged /projects/clang360-import/contrib/ipfilter/ml_ipl.c:r277327-280030
   Reverse-merged /projects/clang370-import/contrib/ipfilter/ml_ipl.c:r287506-288928
   Reverse-merged /projects/clang-trunk/contrib/ipfilter/ml_ipl.c:r283596-287505
   Reverse-merged /head/contrib/ipfilter/ml_ipl.c:r274131-288681,288683-289090,289385-293170
   Reverse-merged /projects/mpsutil/contrib/ipfilter/ml_ipl.c:r286179-290100
   Reverse-merged /vendor/ipfilter/dist/ml_ipl.c:r22515-253468,254219
Index: projects/release-pkg/contrib/ipfilter/mlfk_ipl.c
===================================================================
--- projects/release-pkg/contrib/ipfilter/mlfk_ipl.c	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter/mlfk_ipl.c	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter/mlfk_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /vendor/ipfilter/dist/mlfk_ipl.c:r22515-253468,254219
   Reverse-merged /projects/clang350-import/contrib/ipfilter/mlfk_ipl.c:r274961-276476
   Reverse-merged /projects/clang360-import/contrib/ipfilter/mlfk_ipl.c:r277327-280030
   Reverse-merged /projects/clang370-import/contrib/ipfilter/mlfk_ipl.c:r287506-288928
   Reverse-merged /projects/collation/contrib/ipfilter/mlfk_ipl.c:r286424-290491
   Reverse-merged /projects/clang-trunk/contrib/ipfilter/mlfk_ipl.c:r283596-287505
   Reverse-merged /head/contrib/ipfilter/mlfk_ipl.c:r274131-288681,288683-289090,289385-293170
   Reverse-merged /projects/mpsutil/contrib/ipfilter/mlfk_ipl.c:r286179-290100
Index: projects/release-pkg/contrib/ipfilter/mlh_rule.c
===================================================================
--- projects/release-pkg/contrib/ipfilter/mlh_rule.c	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter/mlh_rule.c	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter/mlh_rule.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /head/contrib/ipfilter/mlh_rule.c:r274131-288681,288683-289090,289385-293170
   Reverse-merged /projects/mpsutil/contrib/ipfilter/mlh_rule.c:r286179-290100
   Reverse-merged /projects/clang350-import/contrib/ipfilter/mlh_rule.c:r274961-276476
   Reverse-merged /vendor/ipfilter/dist/mlh_rule.c:r22515-253468,254219
   Reverse-merged /projects/clang360-import/contrib/ipfilter/mlh_rule.c:r277327-280030
   Reverse-merged /projects/clang370-import/contrib/ipfilter/mlh_rule.c:r287506-288928
   Reverse-merged /projects/collation/contrib/ipfilter/mlh_rule.c:r286424-290491
   Reverse-merged /projects/clang-trunk/contrib/ipfilter/mlh_rule.c:r283596-287505
Index: projects/release-pkg/contrib/ipfilter/mli_ipl.c
===================================================================
--- projects/release-pkg/contrib/ipfilter/mli_ipl.c	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter/mli_ipl.c	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter/mli_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/ipfilter/mli_ipl.c:r274961-276476
   Reverse-merged /projects/clang360-import/contrib/ipfilter/mli_ipl.c:r277327-280030
   Reverse-merged /projects/collation/contrib/ipfilter/mli_ipl.c:r286424-290491
   Reverse-merged /projects/clang370-import/contrib/ipfilter/mli_ipl.c:r287506-288928
   Reverse-merged /projects/clang-trunk/contrib/ipfilter/mli_ipl.c:r283596-287505
   Reverse-merged /head/contrib/ipfilter/mli_ipl.c:r274131-288681,288683-298091
   Reverse-merged /projects/mpsutil/contrib/ipfilter/mli_ipl.c:r286179-290100
   Reverse-merged /vendor/ipfilter/dist/mli_ipl.c:r22515-253468,254219
Index: projects/release-pkg/contrib/ipfilter/mln_ipl.c
===================================================================
--- projects/release-pkg/contrib/ipfilter/mln_ipl.c	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter/mln_ipl.c	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter/mln_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /vendor/ipfilter/dist/mln_ipl.c:r22515-253468,254219
   Reverse-merged /projects/clang350-import/contrib/ipfilter/mln_ipl.c:r274961-276476
   Reverse-merged /projects/clang360-import/contrib/ipfilter/mln_ipl.c:r277327-280030
   Reverse-merged /projects/collation/contrib/ipfilter/mln_ipl.c:r286424-290491
   Reverse-merged /projects/clang370-import/contrib/ipfilter/mln_ipl.c:r287506-288928
   Reverse-merged /projects/clang-trunk/contrib/ipfilter/mln_ipl.c:r283596-287505
   Reverse-merged /head/contrib/ipfilter/mln_ipl.c:r274131-288681,288683-289090,289385-293170
   Reverse-merged /projects/mpsutil/contrib/ipfilter/mln_ipl.c:r286179-290100
Index: projects/release-pkg/contrib/ipfilter/mls_ipl.c
===================================================================
--- projects/release-pkg/contrib/ipfilter/mls_ipl.c	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter/mls_ipl.c	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter/mls_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/ipfilter/mls_ipl.c:r274961-276476
   Reverse-merged /projects/clang360-import/contrib/ipfilter/mls_ipl.c:r277327-280030
   Reverse-merged /projects/collation/contrib/ipfilter/mls_ipl.c:r286424-290491
   Reverse-merged /projects/clang370-import/contrib/ipfilter/mls_ipl.c:r287506-288928
   Reverse-merged /vendor/ipfilter/dist/mls_ipl.c:r22515-253468,254219
   Reverse-merged /projects/clang-trunk/contrib/ipfilter/mls_ipl.c:r283596-287505
   Reverse-merged /head/contrib/ipfilter/mls_ipl.c:r274131-288681,288683-289090,289385-293170
   Reverse-merged /projects/mpsutil/contrib/ipfilter/mls_ipl.c:r286179-290100
Index: projects/release-pkg/contrib/ipfilter
===================================================================
--- projects/release-pkg/contrib/ipfilter	(revision 298094)
+++ projects/release-pkg/contrib/ipfilter	(revision 298095)

Property changes on: projects/release-pkg/contrib/ipfilter
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/ipfilter:r298092-298094
Index: projects/release-pkg/contrib/llvm
===================================================================
--- projects/release-pkg/contrib/llvm	(revision 298094)
+++ projects/release-pkg/contrib/llvm	(revision 298095)

Property changes on: projects/release-pkg/contrib/llvm
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/contrib/llvm:r297567-298094
Index: projects/release-pkg/share/doc/usd/10.exref/exref/ex.rm
===================================================================
--- projects/release-pkg/share/doc/usd/10.exref/exref/ex.rm	(revision 298094)
+++ projects/release-pkg/share/doc/usd/10.exref/exref/ex.rm	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/10.exref/exref/ex.rm
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/pf/head/share/doc/usd/10.exref/exref/ex.rm:r263908
   Reverse-merged /projects/building-blocks/share/doc/usd/10.exref/exref/ex.rm:r275142-275144,275556,275558
   Reverse-merged /projects/clang-sparc64/share/doc/usd/10.exref/exref/ex.rm:r262258-262612
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/exref/ex.rm:r274961-276476
   Reverse-merged /projects/release-embedded/share/doc/usd/10.exref/exref/ex.rm:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/share/doc/usd/10.exref/exref/ex.rm:r221273-222812,222815-223757
   Reverse-merged /vendor/resolver/dist/share/doc/usd/10.exref/exref/ex.rm:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/10.exref/exref/ex.rm:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/10.exref/exref/ex.rm:r277327-280030
   Reverse-merged /projects/head_mfi/share/doc/usd/10.exref/exref/ex.rm:r233621
   Reverse-merged /projects/quota64/share/doc/usd/10.exref/exref/ex.rm:r184125-207707
   Reverse-merged /projects/random_number_generator/share/doc/usd/10.exref/exref/ex.rm:r254613-256243
   Reverse-merged /head/share/doc/usd/10.exref/exref/ex.rm:r274131-281050,281994-282367
   Reverse-merged /head/share/vt/doc/usd/10.exref/exref/ex.rm:r266839
   Reverse-merged /projects/lldb-r201577/share/doc/usd/10.exref/exref/ex.rm:r262185-262527
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/exref/ex.rm:r19305-254211,257997,259086
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/10.exref/exref/ex.rm:r230929-231848
   Reverse-merged /projects/elftoolchain/share/doc/usd/10.exref/exref/ex.rm:r260687-261245
Index: projects/release-pkg/share/doc/usd/10.exref/summary/ex.summary
===================================================================
--- projects/release-pkg/share/doc/usd/10.exref/summary/ex.summary	(revision 298094)
+++ projects/release-pkg/share/doc/usd/10.exref/summary/ex.summary	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/10.exref/summary/ex.summary
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/head_mfi/share/doc/usd/10.exref/summary/ex.summary:r233621
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/exref/ex.summary:r19305-254211,257997,259086
   Reverse-merged /vendor/resolver/dist/share/doc/usd/10.exref/summary/ex.summary:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/10.exref/summary/ex.summary:r274961-276476
   Reverse-merged /projects/lldb-r201577/share/doc/usd/10.exref/summary/ex.summary:r262185-262527
   Reverse-merged /projects/clang360-import/share/doc/usd/10.exref/summary/ex.summary:r277327-280030
   Reverse-merged /projects/quota64/share/doc/usd/10.exref/summary/ex.summary:r184125-207707
   Reverse-merged /head/share/vt/doc/usd/10.exref/summary/ex.summary:r266839
   Reverse-merged /projects/random_number_generator/share/doc/usd/10.exref/summary/ex.summary:r254613-256243
   Reverse-merged /head/share/doc/usd/10.exref/summary/ex.summary:r274131-281050,281994-282367
   Reverse-merged /projects/elftoolchain/share/doc/usd/10.exref/summary/ex.summary:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/10.exref/summary/ex.summary:r230929-231848
   Reverse-merged /projects/clang-sparc64/share/doc/usd/10.exref/summary/ex.summary:r262258-262612
   Reverse-merged /projects/release-embedded/share/doc/usd/10.exref/summary/ex.summary:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/pf/head/share/doc/usd/10.exref/summary/ex.summary:r263908
   Reverse-merged /projects/largeSMP/share/doc/usd/10.exref/summary/ex.summary:r221273-222812,222815-223757
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/exref/ex.summary:r274961-276476
   Reverse-merged /projects/building-blocks/share/doc/usd/10.exref/summary/ex.summary:r275142-275144,275556,275558
Index: projects/release-pkg/share/doc/usd/11.vitut/edittut.ms
===================================================================
--- projects/release-pkg/share/doc/usd/11.vitut/edittut.ms	(revision 298094)
+++ projects/release-pkg/share/doc/usd/11.vitut/edittut.ms	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/11.vitut/edittut.ms
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/pf/head/share/doc/usd/11.vitut/edittut.ms:r263908
   Reverse-merged /projects/building-blocks/share/doc/usd/11.vitut/edittut.ms:r275142-275144,275556,275558
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/edit/edittut.ms:r19305-254211,257997,259086
   Reverse-merged /projects/release-embedded/share/doc/usd/11.vitut/edittut.ms:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/share/doc/usd/11.vitut/edittut.ms:r221273-222812,222815-223757
   Reverse-merged /vendor/resolver/dist/share/doc/usd/11.vitut/edittut.ms:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/11.vitut/edittut.ms:r274961-276476
   Reverse-merged /head/share/vt/doc/usd/11.vitut/edittut.ms:r266839
   Reverse-merged /projects/clang360-import/share/doc/usd/11.vitut/edittut.ms:r277327-280030
   Reverse-merged /projects/head_mfi/share/doc/usd/11.vitut/edittut.ms:r233621
   Reverse-merged /projects/quota64/share/doc/usd/11.vitut/edittut.ms:r184125-207707
   Reverse-merged /projects/random_number_generator/share/doc/usd/11.vitut/edittut.ms:r254613-256243
   Reverse-merged /head/share/doc/usd/11.vitut/edittut.ms:r274131-281050,281994-282367
   Reverse-merged /projects/lldb-r201577/share/doc/usd/11.vitut/edittut.ms:r262185-262527
   Reverse-merged /projects/clang-sparc64/share/doc/usd/11.vitut/edittut.ms:r262258-262612
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/edit/edittut.ms:r274961-276476
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/11.vitut/edittut.ms:r230929-231848
   Reverse-merged /projects/elftoolchain/share/doc/usd/11.vitut/edittut.ms:r260687-261245
Index: projects/release-pkg/share/doc/usd/12.vi/summary/vi.summary
===================================================================
--- projects/release-pkg/share/doc/usd/12.vi/summary/vi.summary	(revision 298094)
+++ projects/release-pkg/share/doc/usd/12.vi/summary/vi.summary	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/12.vi/summary/vi.summary
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /head/share/vt/doc/usd/12.vi/summary/vi.summary:r266839
   Reverse-merged /projects/release-embedded/share/doc/usd/12.vi/summary/vi.summary:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/share/doc/usd/12.vi/summary/vi.summary:r221273-222812,222815-223757
   Reverse-merged /projects/pf/head/share/doc/usd/12.vi/summary/vi.summary:r263908
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.summary:r19305-254211,257997,259086
   Reverse-merged /projects/building-blocks/share/doc/usd/12.vi/summary/vi.summary:r275142-275144,275556,275558
   Reverse-merged /projects/head_mfi/share/doc/usd/12.vi/summary/vi.summary:r233621
   Reverse-merged /projects/lldb-r201577/share/doc/usd/12.vi/summary/vi.summary:r262185-262527
   Reverse-merged /vendor/resolver/dist/share/doc/usd/12.vi/summary/vi.summary:r1540-186085
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.summary:r274961-276476
   Reverse-merged /projects/clang350-import/share/doc/usd/12.vi/summary/vi.summary:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/12.vi/summary/vi.summary:r277327-280030
   Reverse-merged /projects/quota64/share/doc/usd/12.vi/summary/vi.summary:r184125-207707
   Reverse-merged /projects/elftoolchain/share/doc/usd/12.vi/summary/vi.summary:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/12.vi/summary/vi.summary:r230929-231848
   Reverse-merged /projects/random_number_generator/share/doc/usd/12.vi/summary/vi.summary:r254613-256243
   Reverse-merged /head/share/doc/usd/12.vi/summary/vi.summary:r274131-281050,281994-282367
   Reverse-merged /projects/clang-sparc64/share/doc/usd/12.vi/summary/vi.summary:r262258-262612
Index: projects/release-pkg/share/doc/usd/12.vi/vi/vi.chars
===================================================================
--- projects/release-pkg/share/doc/usd/12.vi/vi/vi.chars	(revision 298094)
+++ projects/release-pkg/share/doc/usd/12.vi/vi/vi.chars	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/12.vi/vi/vi.chars
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.chars:r274961-276476
   Reverse-merged /projects/random_number_generator/share/doc/usd/12.vi/vi/vi.chars:r254613-256243
   Reverse-merged /projects/release-embedded/share/doc/usd/12.vi/vi/vi.chars:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /head/share/doc/usd/12.vi/vi/vi.chars:r274131-281050,281996-282367
   Reverse-merged /projects/largeSMP/share/doc/usd/12.vi/vi/vi.chars:r221273-222812,222815-223757
   Reverse-merged /projects/head_mfi/share/doc/usd/12.vi/vi/vi.chars:r233621
   Reverse-merged /head/share/vt/doc/usd/12.vi/vi/vi.chars:r266839
   Reverse-merged /projects/lldb-r201577/share/doc/usd/12.vi/vi/vi.chars:r262185-262527
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.chars:r19305-254211,257997,259086
   Reverse-merged /projects/pf/head/share/doc/usd/12.vi/vi/vi.chars:r263908
   Reverse-merged /projects/building-blocks/share/doc/usd/12.vi/vi/vi.chars:r275142-275144,275556,275558
   Reverse-merged /projects/elftoolchain/share/doc/usd/12.vi/vi/vi.chars:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/12.vi/vi/vi.chars:r230929-231848
   Reverse-merged /vendor/resolver/dist/share/doc/usd/12.vi/vi/vi.chars:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/12.vi/vi/vi.chars:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/12.vi/vi/vi.chars:r277327-280030
   Reverse-merged /projects/clang-sparc64/share/doc/usd/12.vi/vi/vi.chars:r262258-262612
   Reverse-merged /projects/quota64/share/doc/usd/12.vi/vi/vi.chars:r184125-207707
Index: projects/release-pkg/share/doc/usd/12.vi/vi/vi.in
===================================================================
--- projects/release-pkg/share/doc/usd/12.vi/vi/vi.in	(revision 298094)
+++ projects/release-pkg/share/doc/usd/12.vi/vi/vi.in	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/12.vi/vi/vi.in
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/largeSMP/share/doc/usd/12.vi/vi/vi.in:r221273-222812,222815-223757
   Reverse-merged /projects/pf/head/share/doc/usd/12.vi/vi/vi.in:r263908
   Reverse-merged /projects/building-blocks/share/doc/usd/12.vi/vi/vi.in:r275142-275144,275556,275558
   Reverse-merged /projects/head_mfi/share/doc/usd/12.vi/vi/vi.in:r233621
   Reverse-merged /projects/lldb-r201577/share/doc/usd/12.vi/vi/vi.in:r262185-262527
   Reverse-merged /vendor/resolver/dist/share/doc/usd/12.vi/vi/vi.in:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/12.vi/vi/vi.in:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/12.vi/vi/vi.in:r277327-280030
   Reverse-merged /projects/quota64/share/doc/usd/12.vi/vi/vi.in:r184125-207707
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.in:r274961-276476
   Reverse-merged /projects/elftoolchain/share/doc/usd/12.vi/vi/vi.in:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/12.vi/vi/vi.in:r230929-231848
   Reverse-merged /projects/random_number_generator/share/doc/usd/12.vi/vi/vi.in:r254613-256243
   Reverse-merged /head/share/doc/usd/12.vi/vi/vi.in:r274131-281050,281994-282367
   Reverse-merged /head/share/vt/doc/usd/12.vi/vi/vi.in:r266839
   Reverse-merged /projects/clang-sparc64/share/doc/usd/12.vi/vi/vi.in:r262258-262612
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.in:r19305-254211,257997,259086
   Reverse-merged /projects/release-embedded/share/doc/usd/12.vi/vi/vi.in:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
Index: projects/release-pkg/share/doc/usd/12.vi/viapwh/vi.apwh.ms
===================================================================
--- projects/release-pkg/share/doc/usd/12.vi/viapwh/vi.apwh.ms	(revision 298094)
+++ projects/release-pkg/share/doc/usd/12.vi/viapwh/vi.apwh.ms	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/12.vi/viapwh/vi.apwh.ms
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/largeSMP/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r221273-222812,222815-223757
   Reverse-merged /projects/random_number_generator/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r254613-256243
   Reverse-merged /head/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r274131-281050,281994-282367
   Reverse-merged /projects/head_mfi/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r233621
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.apwh.ms:r274961-276476
   Reverse-merged /projects/lldb-r201577/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r262185-262527
   Reverse-merged /projects/pf/head/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r263908
   Reverse-merged /projects/elftoolchain/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r230929-231848
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.apwh.ms:r19305-254211,257997,259086
   Reverse-merged /head/share/vt/doc/usd/12.vi/viapwh/vi.apwh.ms:r266839
   Reverse-merged /projects/building-blocks/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r275142-275144,275556,275558
   Reverse-merged /vendor/resolver/dist/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r277327-280030
   Reverse-merged /projects/release-embedded/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/quota64/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r184125-207707
   Reverse-merged /projects/clang-sparc64/share/doc/usd/12.vi/viapwh/vi.apwh.ms:r262258-262612
Index: projects/release-pkg/share/doc/usd/13.viref/ex.cmd.roff
===================================================================
--- projects/release-pkg/share/doc/usd/13.viref/ex.cmd.roff	(revision 298094)
+++ projects/release-pkg/share/doc/usd/13.viref/ex.cmd.roff	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/13.viref/ex.cmd.roff
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/largeSMP/share/doc/usd/13.viref/ex.cmd.roff:r221273-222812,222815-223757
   Reverse-merged /projects/pf/head/share/doc/usd/13.viref/ex.cmd.roff:r263908
   Reverse-merged /projects/head_mfi/share/doc/usd/13.viref/ex.cmd.roff:r233621
   Reverse-merged /projects/building-blocks/share/doc/usd/13.viref/ex.cmd.roff:r275142-275144,275556,275558
   Reverse-merged /projects/lldb-r201577/share/doc/usd/13.viref/ex.cmd.roff:r262185-262527
   Reverse-merged /vendor/resolver/dist/share/doc/usd/13.viref/ex.cmd.roff:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/13.viref/ex.cmd.roff:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/13.viref/ex.cmd.roff:r277327-280030
   Reverse-merged /projects/quota64/share/doc/usd/13.viref/ex.cmd.roff:r184125-207707
   Reverse-merged /projects/elftoolchain/share/doc/usd/13.viref/ex.cmd.roff:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/13.viref/ex.cmd.roff:r230929-231848
   Reverse-merged /projects/random_number_generator/share/doc/usd/13.viref/ex.cmd.roff:r254613-256243
   Reverse-merged /head/share/doc/usd/13.viref/ex.cmd.roff:r274131-281050,281994-282367
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/ex.cmd.roff:r19305-254211,257997,259086
   Reverse-merged /head/share/vt/doc/usd/13.viref/ex.cmd.roff:r266839
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/ex.cmd.roff:r274961-276476
   Reverse-merged /projects/clang-sparc64/share/doc/usd/13.viref/ex.cmd.roff:r262258-262612
   Reverse-merged /projects/release-embedded/share/doc/usd/13.viref/ex.cmd.roff:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
Index: projects/release-pkg/share/doc/usd/13.viref/ref.so
===================================================================
--- projects/release-pkg/share/doc/usd/13.viref/ref.so	(revision 298094)
+++ projects/release-pkg/share/doc/usd/13.viref/ref.so	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/13.viref/ref.so
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/random_number_generator/share/doc/usd/13.viref/ref.so:r254613-256243
   Reverse-merged /head/share/doc/usd/13.viref/ref.so:r274131-281050,281994-282367
   Reverse-merged /projects/lldb-r201577/share/doc/usd/13.viref/ref.so:r262185-262527
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/ref.so:r19305-254211,257997,259086
   Reverse-merged /head/share/vt/doc/usd/13.viref/ref.so:r266839
   Reverse-merged /projects/elftoolchain/share/doc/usd/13.viref/ref.so:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/13.viref/ref.so:r230929-231848
   Reverse-merged /projects/pf/head/share/doc/usd/13.viref/ref.so:r263908
   Reverse-merged /projects/building-blocks/share/doc/usd/13.viref/ref.so:r275142-275144,275556,275558
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/ref.so:r274961-276476
   Reverse-merged /projects/release-embedded/share/doc/usd/13.viref/ref.so:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/clang-sparc64/share/doc/usd/13.viref/ref.so:r262258-262612
   Reverse-merged /projects/largeSMP/share/doc/usd/13.viref/ref.so:r221273-222812,222815-223757
   Reverse-merged /vendor/resolver/dist/share/doc/usd/13.viref/ref.so:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/13.viref/ref.so:r274961-276476
   Reverse-merged /projects/head_mfi/share/doc/usd/13.viref/ref.so:r233621
   Reverse-merged /projects/clang360-import/share/doc/usd/13.viref/ref.so:r277327-280030
   Reverse-merged /projects/quota64/share/doc/usd/13.viref/ref.so:r184125-207707
Index: projects/release-pkg/share/doc/usd/13.viref/set.opt.roff
===================================================================
--- projects/release-pkg/share/doc/usd/13.viref/set.opt.roff	(revision 298094)
+++ projects/release-pkg/share/doc/usd/13.viref/set.opt.roff	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/13.viref/set.opt.roff
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/head_mfi/share/doc/usd/13.viref/set.opt.roff:r233621
   Reverse-merged /projects/random_number_generator/share/doc/usd/13.viref/set.opt.roff:r254613-256243
   Reverse-merged /head/share/doc/usd/13.viref/set.opt.roff:r274131-281050,281994-282367
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/set.opt.roff:r19305-254211,257997,259086
   Reverse-merged /projects/lldb-r201577/share/doc/usd/13.viref/set.opt.roff:r262185-262527
   Reverse-merged /projects/clang-sparc64/share/doc/usd/13.viref/set.opt.roff:r262258-262612
   Reverse-merged /projects/elftoolchain/share/doc/usd/13.viref/set.opt.roff:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/13.viref/set.opt.roff:r230929-231848
   Reverse-merged /projects/pf/head/share/doc/usd/13.viref/set.opt.roff:r263908
   Reverse-merged /projects/building-blocks/share/doc/usd/13.viref/set.opt.roff:r275142-275144,275556,275558
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/set.opt.roff:r274961-276476
   Reverse-merged /vendor/resolver/dist/share/doc/usd/13.viref/set.opt.roff:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/13.viref/set.opt.roff:r274961-276476
   Reverse-merged /projects/release-embedded/share/doc/usd/13.viref/set.opt.roff:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /head/share/vt/doc/usd/13.viref/set.opt.roff:r266839
   Reverse-merged /projects/clang360-import/share/doc/usd/13.viref/set.opt.roff:r277327-280030
   Reverse-merged /projects/largeSMP/share/doc/usd/13.viref/set.opt.roff:r221273-222812,222815-223757
   Reverse-merged /projects/quota64/share/doc/usd/13.viref/set.opt.roff:r184125-207707
Index: projects/release-pkg/share/doc/usd/13.viref/vi.cmd.roff
===================================================================
--- projects/release-pkg/share/doc/usd/13.viref/vi.cmd.roff	(revision 298094)
+++ projects/release-pkg/share/doc/usd/13.viref/vi.cmd.roff	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/13.viref/vi.cmd.roff
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /vendor/resolver/dist/share/doc/usd/13.viref/vi.cmd.roff:r1540-186085
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/vi.cmd.roff:r274961-276476
   Reverse-merged /projects/clang350-import/share/doc/usd/13.viref/vi.cmd.roff:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/13.viref/vi.cmd.roff:r277327-280030
   Reverse-merged /projects/release-embedded/share/doc/usd/13.viref/vi.cmd.roff:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/quota64/share/doc/usd/13.viref/vi.cmd.roff:r184125-207707
   Reverse-merged /projects/largeSMP/share/doc/usd/13.viref/vi.cmd.roff:r221273-222812,222815-223757
   Reverse-merged /projects/random_number_generator/share/doc/usd/13.viref/vi.cmd.roff:r254613-256243
   Reverse-merged /head/share/doc/usd/13.viref/vi.cmd.roff:r274131-281050,281994-282367
   Reverse-merged /head/share/vt/doc/usd/13.viref/vi.cmd.roff:r266839
   Reverse-merged /projects/head_mfi/share/doc/usd/13.viref/vi.cmd.roff:r233621
   Reverse-merged /projects/clang-sparc64/share/doc/usd/13.viref/vi.cmd.roff:r262258-262612
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/vi.cmd.roff:r19305-254211,257997,259086
   Reverse-merged /projects/lldb-r201577/share/doc/usd/13.viref/vi.cmd.roff:r262185-262527
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/13.viref/vi.cmd.roff:r230929-231848
   Reverse-merged /projects/pf/head/share/doc/usd/13.viref/vi.cmd.roff:r263908
   Reverse-merged /projects/elftoolchain/share/doc/usd/13.viref/vi.cmd.roff:r260687-261245
   Reverse-merged /projects/building-blocks/share/doc/usd/13.viref/vi.cmd.roff:r275142-275144,275556,275558
Index: projects/release-pkg/share/doc/usd/13.viref/vi.ref
===================================================================
--- projects/release-pkg/share/doc/usd/13.viref/vi.ref	(revision 298094)
+++ projects/release-pkg/share/doc/usd/13.viref/vi.ref	(revision 298095)

Property changes on: projects/release-pkg/share/doc/usd/13.viref/vi.ref
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /projects/building-blocks/share/doc/usd/13.viref/vi.ref:r275142-275144,275556,275558
   Reverse-merged /projects/lldb-r201577/share/doc/usd/13.viref/vi.ref:r262185-262527
   Reverse-merged /vendor/resolver/dist/share/doc/usd/13.viref/vi.ref:r1540-186085
   Reverse-merged /projects/clang350-import/share/doc/usd/13.viref/vi.ref:r274961-276476
   Reverse-merged /projects/clang360-import/share/doc/usd/13.viref/vi.ref:r277327-280030
   Reverse-merged /projects/elftoolchain/share/doc/usd/13.viref/vi.ref:r260687-261245
   Reverse-merged /projects/multi-fibv6/head/share/doc/usd/13.viref/vi.ref:r230929-231848
   Reverse-merged /projects/quota64/share/doc/usd/13.viref/vi.ref:r184125-207707
   Reverse-merged /projects/random_number_generator/share/doc/usd/13.viref/vi.ref:r254613-256243
   Reverse-merged /head/share/doc/usd/13.viref/vi.ref:r274131-281050,281994-282367
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/vi.ref:r19305-254211,257997,259086
   Reverse-merged /projects/clang-sparc64/share/doc/usd/13.viref/vi.ref:r262258-262612
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/vi.ref:r274961-276476
   Reverse-merged /head/share/vt/doc/usd/13.viref/vi.ref:r266839
   Reverse-merged /projects/release-embedded/share/doc/usd/13.viref/vi.ref:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Reverse-merged /projects/largeSMP/share/doc/usd/13.viref/vi.ref:r221273-222812,222815-223757
   Reverse-merged /projects/pf/head/share/doc/usd/13.viref/vi.ref:r263908
   Reverse-merged /projects/head_mfi/share/doc/usd/13.viref/vi.ref:r233621
Index: projects/release-pkg/share/examples/kld/random_adaptor/random_adaptor_example.c
===================================================================
--- projects/release-pkg/share/examples/kld/random_adaptor/random_adaptor_example.c	(revision 298094)
+++ projects/release-pkg/share/examples/kld/random_adaptor/random_adaptor_example.c	(revision 298095)

Property changes on: projects/release-pkg/share/examples/kld/random_adaptor/random_adaptor_example.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /projects/quota64/share/examples/kld/random_adaptor/random_adaptor_example.c:r184125-207707
   Reverse-merged /projects/random_number_generator/share/examples/kld/random_adaptor/random_adaptor_example.c:r255354-256243
   Reverse-merged /head/share/examples/kld/random_adaptor/random_adaptor_example.c:r254613-255351,274132-277384
   Reverse-merged /projects/largeSMP/share/examples/kld/random_adaptor/random_adaptor_example.c:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/share/examples/kld/random_adaptor/random_adaptor_example.c:r230929-231848
   Reverse-merged /projects/head_mfi/share/examples/kld/random_adaptor/random_adaptor_example.c:r233621
   Reverse-merged /projects/clang350-import/share/examples/kld/random_adaptor/random_adaptor_example.c:r274961-276476
   Reverse-merged /vendor/resolver/dist/share/examples/kld/random_adaptor/random_adaptor_example.c:r1540-186085
Index: projects/release-pkg/share/man/man4/bhyve.4
===================================================================
--- projects/release-pkg/share/man/man4/bhyve.4	(revision 298094)
+++ projects/release-pkg/share/man/man4/bhyve.4	(revision 298095)

Property changes on: projects/release-pkg/share/man/man4/bhyve.4
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +0,0 ##
   Reverse-merged /projects/clang350-import/share/man/man4/bhyve.4:r274961-276476
   Reverse-merged /vendor/resolver/dist/share/man/man4/bhyve.4:r1540-186085
   Reverse-merged /projects/quota64/share/man/man4/bhyve.4:r184125-207707
   Reverse-merged /user/jimharris/isci/share/man/man4/bhyve.4:r228377-230794
   Reverse-merged /projects/largeSMP/share/man/man4/bhyve.4:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/share/man/man4/bhyve.4:r230929-231848
   Reverse-merged /head/share/man/man4/bhyve.4:r221906-245509,274132-277384
   Reverse-merged /projects/head_mfi/share/man/man4/bhyve.4:r233621
Index: projects/release-pkg/share/man/man4
===================================================================
--- projects/release-pkg/share/man/man4	(revision 298094)
+++ projects/release-pkg/share/man/man4	(revision 298095)

Property changes on: projects/release-pkg/share/man/man4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/share/man/man4:r298092-298094
Index: projects/release-pkg/share/mk/bsd.arch.inc.mk
===================================================================
--- projects/release-pkg/share/mk/bsd.arch.inc.mk	(revision 298094)
+++ projects/release-pkg/share/mk/bsd.arch.inc.mk	(revision 298095)

Property changes on: projects/release-pkg/share/mk/bsd.arch.inc.mk
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,5 +0,0 ##
   Reverse-merged /projects/clang350-import/share/mk/bsd.arch.inc.mk:r274961-276476
   Reverse-merged /vendor/resolver/dist/share/mk/bsd.arch.inc.mk:r1540-186085
   Reverse-merged /projects/quota64/share/mk/bsd.arch.inc.mk:r184125-207707
   Reverse-merged /head/share/mk/bsd.arch.inc.mk:r203399-207112,207114-209022,274132-277384
   Reverse-merged /projects/largeSMP/share/mk/bsd.arch.inc.mk:r221273-222812,222815-223757
Index: projects/release-pkg/share
===================================================================
--- projects/release-pkg/share	(revision 298094)
+++ projects/release-pkg/share	(revision 298095)

Property changes on: projects/release-pkg/share
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/share:r298092-298094
Index: projects/release-pkg/sys/amd64/include/vmm.h
===================================================================
--- projects/release-pkg/sys/amd64/include/vmm.h	(revision 298094)
+++ projects/release-pkg/sys/amd64/include/vmm.h	(revision 298095)

Property changes on: projects/release-pkg/sys/amd64/include/vmm.h
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,22 +0,0 ##
   Reverse-merged /user/dfr/xenhvm/6/sys/amd64/include/vmm.h:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys/amd64/include/vmm.h:r188574-189614
   Reverse-merged /projects/clang-sparc64/sys/amd64/include/vmm.h:r262258-262612
   Reverse-merged /projects/clang-trunk/sys/amd64/include/vmm.h:r283596-287505
   Reverse-merged /user/mav/ata/sys/amd64/include/vmm.h:r189793-190578
   Reverse-merged /user/thompsa/usb/sys/amd64/include/vmm.h:r187190
   Reverse-merged /projects/collation/sys/amd64/include/vmm.h:r286424-290491
   Reverse-merged /projects/largeSMP/sys/amd64/include/vmm.h:r221273-222812,222815-223757
   Reverse-merged /projects/clang350-import/sys/amd64/include/vmm.h:r274961-276476
   Reverse-merged /user/piso/ipfw/sys/amd64/include/vmm.h:r190918,190921,190923,190926
   Reverse-merged /projects/clang360-import/sys/amd64/include/vmm.h:r277327-280030
   Reverse-merged /projects/head_mfi/sys/amd64/include/vmm.h:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620
   Reverse-merged /projects/clang370-import/sys/amd64/include/vmm.h:r287506-288928
   Reverse-merged /projects/quota64/sys/amd64/include/vmm.h:r184125-207707
   Reverse-merged /user/jimharris/isci/sys/amd64/include/vmm.h:r228377-230794
   Reverse-merged /user/piso/sys/amd64/include/vmm.h:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /projects/mpsutil/sys/amd64/include/vmm.h:r286179-290100
   Reverse-merged /head/sys/amd64/include/vmm.h:r221906-245542,274131-289090,289385-293170
   Reverse-merged /projects/multi-fibv6/head/sys/amd64/include/vmm.h:r230929-231848
   Reverse-merged /projects/cambria/sys/amd64/include/vmm.h:r186008-186350
   Reverse-merged /user/alfred/9-alfred/sys/amd64/include/vmm.h:r242488
   Reverse-merged /user/peter/kinfo/sys/amd64/include/vmm.h:r185413-185547
Index: projects/release-pkg/sys/amd64/include/vmm_dev.h
===================================================================
--- projects/release-pkg/sys/amd64/include/vmm_dev.h	(revision 298094)
+++ projects/release-pkg/sys/amd64/include/vmm_dev.h	(revision 298095)

Property changes on: projects/release-pkg/sys/amd64/include/vmm_dev.h
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,21 +0,0 ##
   Reverse-merged /projects/clang-trunk/sys/amd64/include/vmm_dev.h:r283596-287505
   Reverse-merged /user/piso/sys/amd64/include/vmm_dev.h:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /user/mav/ata/sys/amd64/include/vmm_dev.h:r189793-190578
   Reverse-merged /user/jimharris/isci/sys/amd64/include/vmm_dev.h:r228377-230794
   Reverse-merged /user/thompsa/usb/sys/amd64/include/vmm_dev.h:r187190
   Reverse-merged /projects/clang-sparc64/sys/amd64/include/vmm_dev.h:r262258-262612
   Reverse-merged /projects/clang350-import/sys/amd64/include/vmm_dev.h:r274961-276476
   Reverse-merged /projects/multi-fibv6/head/sys/amd64/include/vmm_dev.h:r230929-231848
   Reverse-merged /projects/clang370-import/sys/amd64/include/vmm_dev.h:r287506-288928
   Reverse-merged /projects/quota64/sys/amd64/include/vmm_dev.h:r184125-207707
   Reverse-merged /user/dfr/xenhvm/6/sys/amd64/include/vmm_dev.h:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys/amd64/include/vmm_dev.h:r188574-189614
   Reverse-merged /projects/collation/sys/amd64/include/vmm_dev.h:r286424-290491
   Reverse-merged /head/sys/amd64/include/vmm_dev.h:r221906-245542,274131-289090,289385-293170
   Reverse-merged /projects/mpsutil/sys/amd64/include/vmm_dev.h:r286179-290100
   Reverse-merged /user/piso/ipfw/sys/amd64/include/vmm_dev.h:r190918,190921,190923,190926
   Reverse-merged /projects/largeSMP/sys/amd64/include/vmm_dev.h:r221273-222812,222815-223757
   Reverse-merged /projects/cambria/sys/amd64/include/vmm_dev.h:r186008-186350
   Reverse-merged /user/alfred/9-alfred/sys/amd64/include/vmm_dev.h:r242488
   Reverse-merged /user/peter/kinfo/sys/amd64/include/vmm_dev.h:r185413-185547
   Reverse-merged /projects/head_mfi/sys/amd64/include/vmm_dev.h:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620
Index: projects/release-pkg/sys/amd64/include/vmm_instruction_emul.h
===================================================================
--- projects/release-pkg/sys/amd64/include/vmm_instruction_emul.h	(revision 298094)
+++ projects/release-pkg/sys/amd64/include/vmm_instruction_emul.h	(revision 298095)

Property changes on: projects/release-pkg/sys/amd64/include/vmm_instruction_emul.h
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,16 +0,0 ##
   Reverse-merged /projects/quota64/sys/amd64/include/vmm_instruction_emul.h:r184125-207707
   Reverse-merged /user/piso/sys/amd64/include/vmm_instruction_emul.h:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /head/sys/amd64/include/vmm_instruction_emul.h:r221906-245542,274131-282613
   Reverse-merged /user/jimharris/isci/sys/amd64/include/vmm_instruction_emul.h:r228377-230794
   Reverse-merged /projects/multi-fibv6/head/sys/amd64/include/vmm_instruction_emul.h:r230929-231848
   Reverse-merged /projects/cambria/sys/amd64/include/vmm_instruction_emul.h:r186008-186350
   Reverse-merged /user/dfr/xenhvm/6/sys/amd64/include/vmm_instruction_emul.h:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys/amd64/include/vmm_instruction_emul.h:r188574-189614
   Reverse-merged /user/alfred/9-alfred/sys/amd64/include/vmm_instruction_emul.h:r242488
   Reverse-merged /user/peter/kinfo/sys/amd64/include/vmm_instruction_emul.h:r185413-185547
   Reverse-merged /user/mav/ata/sys/amd64/include/vmm_instruction_emul.h:r189793-190578
   Reverse-merged /user/thompsa/usb/sys/amd64/include/vmm_instruction_emul.h:r187190
   Reverse-merged /projects/largeSMP/sys/amd64/include/vmm_instruction_emul.h:r221273-222812,222815-223757
   Reverse-merged /user/piso/ipfw/sys/amd64/include/vmm_instruction_emul.h:r190918,190921,190923,190926
   Reverse-merged /projects/head_mfi/sys/amd64/include/vmm_instruction_emul.h:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620
   Reverse-merged /projects/clang350-import/sys/amd64/include/vmm_instruction_emul.h:r274961-276476
Index: projects/release-pkg/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
===================================================================
--- projects/release-pkg/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	(revision 298094)
+++ projects/release-pkg/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	(revision 298095)

Property changes on: projects/release-pkg/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,9 +0,0 ##
   Reverse-merged /projects/clang350-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r274961-276476
   Reverse-merged /projects/clang370-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r287506-288928
   Reverse-merged /projects/collation/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r286424-290491
   Reverse-merged /projects/clang380-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r292913-296412
   Reverse-merged /projects/clang-trunk/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r283596-287505
   Reverse-merged /head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r274131-298091
   Reverse-merged /projects/mpsutil/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r286179-290100
   Reverse-merged /vendor-sys/ipfilter/dist/netinet/ip_fil_freebsd.c:r23283-255260
   Reverse-merged /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c:r145517-253463
Index: projects/release-pkg/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
===================================================================
--- projects/release-pkg/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c	(revision 298094)
+++ projects/release-pkg/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c	(revision 298095)

Property changes on: projects/release-pkg/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,4 +0,0 ##
   Reverse-merged /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c:r53643-253463
   Reverse-merged /projects/clang350-import/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c:r274961-276476
   Reverse-merged /head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c:r274132-277384
   Reverse-merged /vendor-sys/ipfilter/dist/netinet/ip_raudio_pxy.c:r23283-255281
Index: projects/release-pkg/sys/contrib/ipfilter
===================================================================
--- projects/release-pkg/sys/contrib/ipfilter	(revision 298094)
+++ projects/release-pkg/sys/contrib/ipfilter	(revision 298095)

Property changes on: projects/release-pkg/sys/contrib/ipfilter
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/ipfilter:r298092-298094
Index: projects/release-pkg/sys/mips/beri/fdt_ic_if.m
===================================================================
--- projects/release-pkg/sys/mips/beri/fdt_ic_if.m	(revision 298094)
+++ projects/release-pkg/sys/mips/beri/fdt_ic_if.m	(revision 298095)

Property changes on: projects/release-pkg/sys/mips/beri/fdt_ic_if.m
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,18 +0,0 ##
   Reverse-merged /head/sys/mips/beri/fdt_ic_if.m:r274132-277384
   Reverse-merged /user/piso/sys/kern/bus_if.m:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /user/mav/ata/sys/kern/bus_if.m:r189793-190578
   Reverse-merged /user/thompsa/usb/sys/kern/bus_if.m:r187190
   Reverse-merged /user/np/cxl_tuning/sys/kern/bus_if.m:r254336,254386,254736
   Reverse-merged /projects/multi-fibv6/head/sys/kern/bus_if.m:r230929-231848
   Reverse-merged /projects/quota64/sys/kern/bus_if.m:r184125-207707
   Reverse-merged /user/dfr/xenhvm/6/sys/kern/bus_if.m:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys/kern/bus_if.m:r188574-189614
   Reverse-merged /projects/random_number_generator/sys/kern/bus_if.m:r254613-256400
   Reverse-merged /projects/clang350-import/sys/mips/beri/fdt_ic_if.m:r274961-276476
   Reverse-merged /projects/largeSMP/sys/kern/bus_if.m:r221273-222812,222815-223757
   Reverse-merged /projects/cambria/sys/kern/bus_if.m:r186008-186350
   Reverse-merged /projects/head_mfi/sys/kern/bus_if.m:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620
   Reverse-merged /user/jimharris/isci/sys/kern/bus_if.m:r228377-230794
   Reverse-merged /user/piso/ipfw/sys/kern/bus_if.m:r190918,190921,190923,190926
   Reverse-merged /user/peter/kinfo/sys/kern/bus_if.m:r185413-185547
   Reverse-merged /user/alfred/9-alfred/sys/kern/bus_if.m:r242488
Index: projects/release-pkg/sys/x86/include/acpica_machdep.h
===================================================================
--- projects/release-pkg/sys/x86/include/acpica_machdep.h	(revision 298094)
+++ projects/release-pkg/sys/x86/include/acpica_machdep.h	(revision 298095)

Property changes on: projects/release-pkg/sys/x86/include/acpica_machdep.h
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,16 +0,0 ##
   Reverse-merged /user/dfr/xenhvm/6/sys/amd64/include/acpica_machdep.h:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys/amd64/include/acpica_machdep.h:r188574-189614
   Reverse-merged /user/piso/ipfw/sys/amd64/include/acpica_machdep.h:r190918,190921,190923,190926
   Reverse-merged /projects/clang350-import/sys/x86/include/acpica_machdep.h:r274961-276476
   Reverse-merged /projects/cambria/sys/amd64/include/acpica_machdep.h:r186008-186350
   Reverse-merged /user/alfred/9-alfred/sys/amd64/include/acpica_machdep.h:r242488
   Reverse-merged /user/peter/kinfo/sys/amd64/include/acpica_machdep.h:r185413-185547
   Reverse-merged /head/sys/x86/include/acpica_machdep.h:r274131-282613,282616-283655
   Reverse-merged /projects/largeSMP/sys/amd64/include/acpica_machdep.h:r221273-222812,222815-223757
   Reverse-merged /projects/head_mfi/sys/amd64/include/acpica_machdep.h:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620
   Reverse-merged /user/mav/ata/sys/amd64/include/acpica_machdep.h:r189793-190578
   Reverse-merged /user/thompsa/usb/sys/amd64/include/acpica_machdep.h:r187190
   Reverse-merged /user/piso/sys/amd64/include/acpica_machdep.h:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /user/jimharris/isci/sys/amd64/include/acpica_machdep.h:r228377-230794
   Reverse-merged /projects/quota64/sys/amd64/include/acpica_machdep.h:r184125-207707
   Reverse-merged /projects/multi-fibv6/head/sys/amd64/include/acpica_machdep.h:r230929-231848
Index: projects/release-pkg/sys
===================================================================
--- projects/release-pkg/sys	(revision 298094)
+++ projects/release-pkg/sys	(revision 298095)

Property changes on: projects/release-pkg/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r298092-298094
Index: projects/release-pkg
===================================================================
--- projects/release-pkg	(revision 298094)
+++ projects/release-pkg	(revision 298095)

Property changes on: projects/release-pkg
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r298092-298094