Index: head/contrib/ipfilter/ml_ipl.c
===================================================================
--- head/contrib/ipfilter/ml_ipl.c	(revision 298093)
+++ head/contrib/ipfilter/ml_ipl.c	(revision 298094)

Property changes on: head/contrib/ipfilter/ml_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +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 /projects/mpsutil/contrib/ipfilter/ml_ipl.c:r286179-290100
   Reverse-merged /vendor/ipfilter/dist/ml_ipl.c:r22515-253468,254219
Index: head/contrib/ipfilter/mlfk_ipl.c
===================================================================
--- head/contrib/ipfilter/mlfk_ipl.c	(revision 298093)
+++ head/contrib/ipfilter/mlfk_ipl.c	(revision 298094)

Property changes on: head/contrib/ipfilter/mlfk_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +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 /projects/mpsutil/contrib/ipfilter/mlfk_ipl.c:r286179-290100
Index: head/contrib/ipfilter/mlh_rule.c
===================================================================
--- head/contrib/ipfilter/mlh_rule.c	(revision 298093)
+++ head/contrib/ipfilter/mlh_rule.c	(revision 298094)

Property changes on: head/contrib/ipfilter/mlh_rule.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +0,0 ##
   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: head/contrib/ipfilter/mli_ipl.c
===================================================================
--- head/contrib/ipfilter/mli_ipl.c	(revision 298093)
+++ head/contrib/ipfilter/mli_ipl.c	(revision 298094)

Property changes on: head/contrib/ipfilter/mli_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +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 /projects/mpsutil/contrib/ipfilter/mli_ipl.c:r286179-290100
   Reverse-merged /vendor/ipfilter/dist/mli_ipl.c:r22515-253468,254219
Index: head/contrib/ipfilter/mln_ipl.c
===================================================================
--- head/contrib/ipfilter/mln_ipl.c	(revision 298093)
+++ head/contrib/ipfilter/mln_ipl.c	(revision 298094)

Property changes on: head/contrib/ipfilter/mln_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +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 /projects/mpsutil/contrib/ipfilter/mln_ipl.c:r286179-290100
Index: head/contrib/ipfilter/mls_ipl.c
===================================================================
--- head/contrib/ipfilter/mls_ipl.c	(revision 298093)
+++ head/contrib/ipfilter/mls_ipl.c	(revision 298094)

Property changes on: head/contrib/ipfilter/mls_ipl.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,7 +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 /projects/mpsutil/contrib/ipfilter/mls_ipl.c:r286179-290100
Index: head/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
===================================================================
--- head/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp	(revision 298093)
+++ head/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp	(revision 298094)

Property changes on: head/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,14 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r274961-276476
   Reverse-merged /vendor/resolver/dist/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r1540-186085
   Reverse-merged /projects/clang360-import/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r277327-280030
   Reverse-merged /projects/lldb-r201577/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r262185-262527
   Reverse-merged /projects/clang370-import/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r287506-288928
   Reverse-merged /projects/clang380-import/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r292913-296412
   Reverse-merged /projects/quota64/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r184125-207707
   Reverse-merged /projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r262258-262260
   Reverse-merged /vendor/llvm/dist/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r208954-265892,274955-292936
   Reverse-merged /projects/clang-trunk/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r283596-287505
   Reverse-merged /projects/largeSMP/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r221273-222812,222815-223757
   Reverse-merged /projects/mpsutil/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r286179-290100
   Reverse-merged /projects/multi-fibv6/head/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r230929-231848
   Reverse-merged /projects/collation/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp:r286424-290491
Index: head/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
===================================================================
--- head/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp	(revision 298093)
+++ head/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp	(revision 298094)

Property changes on: head/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,14 +0,0 ##
   Reverse-merged /projects/clang380-import/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r292913-296412
   Reverse-merged /projects/quota64/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r184125-207707
   Reverse-merged /projects/clang-trunk/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r283596-287505
   Reverse-merged /vendor/llvm/dist/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r208954-265892,274955-292936
   Reverse-merged /projects/mpsutil/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r286179-290100
   Reverse-merged /projects/collation/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r286424-290491
   Reverse-merged /projects/largeSMP/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r230929-231848
   Reverse-merged /projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r262258-262260
   Reverse-merged /projects/clang350-import/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r274961-276476
   Reverse-merged /vendor/resolver/dist/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r1540-186085
   Reverse-merged /projects/clang360-import/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r277327-280030
   Reverse-merged /projects/clang370-import/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r287506-288928
   Reverse-merged /projects/lldb-r201577/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp:r262185-262527
Index: head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp
===================================================================
--- head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp	(revision 298093)
+++ head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp	(revision 298094)

Property changes on: head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,12 +0,0 ##
   Reverse-merged /projects/multi-fibv6/head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r230929-231848
   Reverse-merged /projects/clang350-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r274961-276476
   Reverse-merged /vendor/resolver/dist/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r1540-186085
   Reverse-merged /projects/clang370-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r287506-288928
   Reverse-merged /projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r262258-262260
   Reverse-merged /projects/quota64/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r184125-207707
   Reverse-merged /projects/clang-trunk/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r283596-287505
   Reverse-merged /projects/mpsutil/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r286179-290100
   Reverse-merged /projects/lldb-r201577/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r262185-262527
   Reverse-merged /projects/collation/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r286424-290491
   Reverse-merged /vendor/llvm/dist/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r208954-265892,274955-284189
   Reverse-merged /projects/largeSMP/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp:r221273-222812,222815-223757
Index: head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h
===================================================================
--- head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h	(revision 298093)
+++ head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h	(revision 298094)

Property changes on: head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,14 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r274961-276476
   Reverse-merged /vendor/resolver/dist/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r1540-186085
   Reverse-merged /projects/clang360-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r277327-280030
   Reverse-merged /projects/clang370-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r287506-288928
   Reverse-merged /vendor/llvm/dist/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r208954-265892,274955-292936
   Reverse-merged /projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r262258-262260
   Reverse-merged /projects/clang380-import/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r292913-296412
   Reverse-merged /projects/largeSMP/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r221273-222812,222815-223757
   Reverse-merged /projects/quota64/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r184125-207707
   Reverse-merged /projects/multi-fibv6/head/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r230929-231848
   Reverse-merged /projects/clang-trunk/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r283596-287505
   Reverse-merged /projects/mpsutil/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r286179-290100
   Reverse-merged /projects/collation/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r286424-290491
   Reverse-merged /projects/lldb-r201577/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h:r262185-262527
Index: head/share/doc/usd/10.exref/exref/ex.rm
===================================================================
--- head/share/doc/usd/10.exref/exref/ex.rm	(revision 298093)
+++ head/share/doc/usd/10.exref/exref/ex.rm	(revision 298094)

Property changes on: head/share/doc/usd/10.exref/exref/ex.rm
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/exref/ex.rm:r274961-276476
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/exref/ex.rm:r19305-254211,257997,259086
Index: head/share/doc/usd/10.exref/summary/ex.summary
===================================================================
--- head/share/doc/usd/10.exref/summary/ex.summary	(revision 298093)
+++ head/share/doc/usd/10.exref/summary/ex.summary	(revision 298094)

Property changes on: head/share/doc/usd/10.exref/summary/ex.summary
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/exref/ex.summary:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/exref/ex.summary:r274961-276476
Index: head/share/doc/usd/11.vitut/edittut.ms
===================================================================
--- head/share/doc/usd/11.vitut/edittut.ms	(revision 298093)
+++ head/share/doc/usd/11.vitut/edittut.ms	(revision 298094)

Property changes on: head/share/doc/usd/11.vitut/edittut.ms
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/edit/edittut.ms:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/edit/edittut.ms:r274961-276476
Index: head/share/doc/usd/12.vi/summary/vi.summary
===================================================================
--- head/share/doc/usd/12.vi/summary/vi.summary	(revision 298093)
+++ head/share/doc/usd/12.vi/summary/vi.summary	(revision 298094)

Property changes on: head/share/doc/usd/12.vi/summary/vi.summary
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.summary:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.summary:r274961-276476
Index: head/share/doc/usd/12.vi/vi/vi.chars
===================================================================
--- head/share/doc/usd/12.vi/vi/vi.chars	(revision 298093)
+++ head/share/doc/usd/12.vi/vi/vi.chars	(revision 298094)

Property changes on: head/share/doc/usd/12.vi/vi/vi.chars
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.chars:r274961-276476
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.chars:r19305-254211,257997,259086
Index: head/share/doc/usd/12.vi/vi/vi.in
===================================================================
--- head/share/doc/usd/12.vi/vi/vi.in	(revision 298093)
+++ head/share/doc/usd/12.vi/vi/vi.in	(revision 298094)

Property changes on: head/share/doc/usd/12.vi/vi/vi.in
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.in:r274961-276476
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.in:r19305-254211,257997,259086
Index: head/share/doc/usd/12.vi/viapwh/vi.apwh.ms
===================================================================
--- head/share/doc/usd/12.vi/viapwh/vi.apwh.ms	(revision 298093)
+++ head/share/doc/usd/12.vi/viapwh/vi.apwh.ms	(revision 298094)

Property changes on: head/share/doc/usd/12.vi/viapwh/vi.apwh.ms
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vitut/vi.apwh.ms:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vitut/vi.apwh.ms:r274961-276476
Index: head/share/doc/usd/13.viref/ex.cmd.roff
===================================================================
--- head/share/doc/usd/13.viref/ex.cmd.roff	(revision 298093)
+++ head/share/doc/usd/13.viref/ex.cmd.roff	(revision 298094)

Property changes on: head/share/doc/usd/13.viref/ex.cmd.roff
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/ex.cmd.roff:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/ex.cmd.roff:r274961-276476
Index: head/share/doc/usd/13.viref/ref.so
===================================================================
--- head/share/doc/usd/13.viref/ref.so	(revision 298093)
+++ head/share/doc/usd/13.viref/ref.so	(revision 298094)

Property changes on: head/share/doc/usd/13.viref/ref.so
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/ref.so:r274961-276476
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/ref.so:r19305-254211,257997,259086
Index: head/share/doc/usd/13.viref/set.opt.roff
===================================================================
--- head/share/doc/usd/13.viref/set.opt.roff	(revision 298093)
+++ head/share/doc/usd/13.viref/set.opt.roff	(revision 298094)

Property changes on: head/share/doc/usd/13.viref/set.opt.roff
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/set.opt.roff:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/set.opt.roff:r274961-276476
Index: head/share/doc/usd/13.viref/vi.cmd.roff
===================================================================
--- head/share/doc/usd/13.viref/vi.cmd.roff	(revision 298093)
+++ head/share/doc/usd/13.viref/vi.cmd.roff	(revision 298094)

Property changes on: head/share/doc/usd/13.viref/vi.cmd.roff
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/vi.cmd.roff:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/vi.cmd.roff:r274961-276476
Index: head/share/doc/usd/13.viref/vi.ref
===================================================================
--- head/share/doc/usd/13.viref/vi.ref	(revision 298093)
+++ head/share/doc/usd/13.viref/vi.ref	(revision 298094)

Property changes on: head/share/doc/usd/13.viref/vi.ref
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
   Reverse-merged /vendor/nvi/dist/docs/USD.doc/vi.ref/vi.ref:r19305-254211,257997,259086
   Reverse-merged /projects/clang350-import/contrib/nvi/docs/USD.doc/vi.ref/vi.ref:r274961-276476
Index: head/share/examples/kld/random_adaptor/random_adaptor_example.c
===================================================================
--- head/share/examples/kld/random_adaptor/random_adaptor_example.c	(revision 298093)
+++ head/share/examples/kld/random_adaptor/random_adaptor_example.c	(revision 298094)

Property changes on: head/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
   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: head/share/man/man4/bhyve.4
===================================================================
--- head/share/man/man4/bhyve.4	(revision 298093)
+++ head/share/man/man4/bhyve.4	(revision 298094)

Property changes on: head/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
   Reverse-merged /projects/head_mfi/share/man/man4/bhyve.4:r233621
Index: head/share/mk/bsd.arch.inc.mk
===================================================================
--- head/share/mk/bsd.arch.inc.mk	(revision 298093)
+++ head/share/mk/bsd.arch.inc.mk	(revision 298094)

Property changes on: head/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
   Reverse-merged /projects/largeSMP/share/mk/bsd.arch.inc.mk:r221273-222812,222815-223757
Index: head/sys/amd64/include/vmm.h
===================================================================
--- head/sys/amd64/include/vmm.h	(revision 298093)
+++ head/sys/amd64/include/vmm.h	(revision 298094)

Property changes on: head/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
   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: head/sys/amd64/include/vmm_dev.h
===================================================================
--- head/sys/amd64/include/vmm_dev.h	(revision 298093)
+++ head/sys/amd64/include/vmm_dev.h	(revision 298094)

Property changes on: head/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
   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: head/sys/amd64/include/vmm_instruction_emul.h
===================================================================
--- head/sys/amd64/include/vmm_instruction_emul.h	(revision 298093)
+++ head/sys/amd64/include/vmm_instruction_emul.h	(revision 298094)

Property changes on: head/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
   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: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
===================================================================
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	(revision 298093)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	(revision 298094)

Property changes on: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,8 +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 /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: head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
===================================================================
--- head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c	(revision 298093)
+++ head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c	(revision 298094)

Property changes on: head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,3 +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 /vendor-sys/ipfilter/dist/netinet/ip_raudio_pxy.c:r23283-255281
Index: head/sys/mips/beri/fdt_ic_if.m
===================================================================
--- head/sys/mips/beri/fdt_ic_if.m	(revision 298093)
+++ head/sys/mips/beri/fdt_ic_if.m	(revision 298094)

Property changes on: head/sys/mips/beri/fdt_ic_if.m
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,17 +0,0 ##
   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/peter/kinfo/sys/kern/bus_if.m:r185413-185547
   Reverse-merged /user/piso/ipfw/sys/kern/bus_if.m:r190918,190921,190923,190926
   Reverse-merged /user/alfred/9-alfred/sys/kern/bus_if.m:r242488
Index: head/sys/x86/include/acpica_machdep.h
===================================================================
--- head/sys/x86/include/acpica_machdep.h	(revision 298093)
+++ head/sys/x86/include/acpica_machdep.h	(revision 298094)

Property changes on: head/sys/x86/include/acpica_machdep.h
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,15 +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 /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 /projects/cambria/sys/amd64/include/acpica_machdep.h:r186008-186350
   Reverse-merged /user/jimharris/isci/sys/amd64/include/acpica_machdep.h:r228377-230794
   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 /projects/quota64/sys/amd64/include/acpica_machdep.h:r184125-207707
   Reverse-merged /projects/largeSMP/sys/amd64/include/acpica_machdep.h:r221273-222812,222815-223757
   Reverse-merged /projects/multi-fibv6/head/sys/amd64/include/acpica_machdep.h:r230929-231848
   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