Index: stable/7/sys/contrib/pf =================================================================== --- stable/7/sys/contrib/pf (revision 195657) +++ stable/7/sys/contrib/pf (revision 195658) Property changes on: stable/7/sys/contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/pf:r193131 Index: stable/7/sys/geom/label/g_label.c =================================================================== --- stable/7/sys/geom/label/g_label.c (revision 195657) +++ stable/7/sys/geom/label/g_label.c (revision 195658) Property changes on: stable/7/sys/geom/label/g_label.c ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,3 +0,0 ## Reverse-merged /user/kmacy/releng_7_2_fcs/sys/geom/label/g_label.c:r195299 Reverse-merged /user/peter/kinfo/sys/geom/label/g_label.c:r185413-185547 Reverse-merged /head/sys/geom/label/g_label.c:r167515,167524-167529,167538,167560-167561,167566,167655,167734,167746,167751,167760,167762,167769,167840,167847-167848,167862,168351,168490-168492,168496,168499,168505,168539-168540,168620,168642,168644,168646,168650,168736-168737,168748-168750,168760,168767,168770,168886,168888,168890,169052-169053,169978,169988,169990,169994,170007-170008,170037-170038,170076,170081,170083,170197,170654,170789,170869,171335,171469,171471,171803-171804,171868,171978,172096,172100-172101,172105,172109,172147,172568,172588,172613-172615,172696,172734,172738-172739,172779,172811,172857,172919,172940,172995,173081,173155,173215,173249,173336,173442,173468,173522,173573,173592,173742,173817,173846,173901,173918,173928,173970,174004,174025,174030,174051,174054,174056,174058,174104,174113-174114,174141,174150,174176,174182-174186,174193-174194,174240,174249,174267,174326,174437,174452,174456,174465,174499,174510,174543-174544,174578-174579,174596,174598,174643-174644,174654,174700,174708,174756,174758,174777,174779-174781,174799,174821,174825,174848,174882,174894,174937-174940,174982,175019-175021,175041,175053-175056,175058,175067,175105,175119-175120,175155,175162,175301,175325,175328-175329,175379-175381,175397,175404,175417,175466,175622,175666,175763,175870,175897,175903-175905,176041,176093,176203-176204,176258,176260,176264-176265,176426,176448,176471-176472,176526,176572,176577,176596,176613,176623-176624,176650,176672,176718,176724,176729-176730,176744-176745,176750,176755,176759,176797,176803,176811,176821,176859,176880,176906,176910,176935,176952,176967,176996,177041,177103-177105,177135,177181,177253,177255,177257,177261,177272,177276,177304,177325,177342,177350,177369,177373,177414,177416,177431,177457,177459,177467,177480,177489,177505,177507,177509-177510,177512,177529,177532,177534-177535,177597,177604,177612,177621,177624,177659,177662,177680-177681,177684-177685,177692,177702,177713,177738,177808,177843,177851,177862,177874,177881,177883,177886-177889,177899,177904,177916-177917,177932,177940,177943-177944,177956,177985,178001,178010,178027,178033,178046,178057,178070,178092,178109-178110,178112,178131-178132,178147,178151,178153,178155,178180,178241,178243,178247,178250,178257,178280,178285,178302,178304,178318-178322,178324-178325,178376-178378,178392,178419-178420,178444,178461,178492-178493,178585,178599-178600,178630,178637,178725,178767,178786,178795-178796,178800,178804,178814,178853,178872,178875,178893,178920,178928,178933,178935,178947,178968,178975-178976,178978,179009,179019,179060,179074,179076,179093-179094,179097,179099,179101,179141,179151,179157,179159,179164,179174-179175,179180,179196,179205,179229,179242-179243,179268,179289,179296,179308,179312-179313,179336,179338,179375,179382,179392,179408-179410,179412,179414,179423,179425,179436,179445,179458,179467,179471,179474,179487-179488,179490,179510,179517,179623,179631,179634,179637,179640,179644-179646,179653,179655,179664-179665,179670,179693,179695,179705,179715-179716,179720,179722,179745,179747-179752,179755-179756,179763,179765,179771,179777,179781,179783,179786-179787,179803,179806,179808,179831-179833,179853,179860,179879,179881,179887,179894-179896,179898,179917,179921,179923,179925,179967-179969,179971,179973,179977-179978,180010,180025,180032,180037-180038,180042,180059,180062,180064,180069,180072-180073,180077,180090,180098-180099,180101,180108,180110,180127,180131-180132,180139,180145,180152-180153,180166-180178,180198,180210-180211,180215,180217,180220,180233,180249,180252-180253,180255,180262,180268,180298-180299,180304-180308,180312-180313,180326,180333,180336-180338,180340,180343-180344,180346,180348,180352,180356-180358,180362,180365,180368,180371,180373-180374,180376-180378,180382-180387,180389-180392,180422,180425,180427-180429,180433,180437,180445-180447,180453,180484,180486,180495,180498,180503,180513,180515,180532,180536,180551-180552,180558,180567,180570,180580,180582-180584,180586,180589,180598,180600,180607,180610,180612,180616,180629,180633,180639,180644,180647,180649-180651,180664,180668,180673,180675,180686,180692,180699,180701,180703-180704,180706,180708-180709,180711-180712,180715-180716,180735,180738,180743,180753-180754,180756,180758,180760,180779-180781,180791,180799,180840,180846,180869,180879,180923,180937,180946,180950,180952,180954-180957,180965,180968,180981-180982,180990,180992,181000,181002,181007,181016,181018,181020,181024,181040,181053-181054,181060,181069,181089,181093,181126,181129,181132,181137,181139,181163,181235,181254,181270-181275,181282,181286,181295,181297,181300-181301,181330,181333-181334,181336-181337,181345,181347,181364-181365,181381,181394,181398-181399,181430,181432-181433,181436,181463-181464,181467,181524,181528,181556-181557,181593,181603-181604,181606,181617-181619,181627,181635,181640,181642,181644-181645,181647-181649,181655,181683-181685,181691,181693,181697,181700-181701,181717,181740,181753,181782,181791,181823-181824,181839,181841,181843-181844,181846,181848,181853,181868,181875,181885,181925,181931,181933-181934,181953,181964,181966,181970,181972-181976,181987,181992,182003,182011,182015,182018,182020,182025,182045-182048,182055-182056,182059-182062,182066,182070,182078-182081,182085,182090,182106,182108,182110-182112,182114-182115,182118-182120,182122,182153,182161,182172-182173,182193,182201,182220,182268,182292-182293,182311,182321-182322,182364-182367,182376,182380,182391,182401,182403,182405,182413,182424,182433,182441,182461,182463,182467-182469,182476-182478,182488,182524,182537,182555,182600,182670,182682,182684,182688-182689,182691,182713,182722,182729-182730,182739,182743,182750,182754,182766-182769,182773-182774,182777,182781,182783,182799,182808,182824,182840,182849,182854-182855,182865-182868,182875-182880,182883-182885,182887-182888,182890,182892,182896,182908,182910,182913,182915-182916,182918,182936,182947,182959-182961,182967,182995,182999,183001,183005,183013-183014,183017,183019,183024-183025,183032,183034,183067,183070-183074,183078-183080,183093,183095,183097,183128,183135,183142,183144,183151-183152,183169,183190,183194,183201-183204,183207,183211-183216,183236,183264-183265,183280-183281,183288,183298,183322-183323,183330-183331,183337,183346,183351,183356,183363,183365,183380,183383,183397-183398,183410-183413,183418-183420,183423,183454-183455,183460-183461,183485-183486,183488-183493,183503-183505,183509,183512,183515,183518-183519,183539,183552,183555,183558,183561,183563,183567,183571-183573,183587,183590,183600,183603-183606,183610-183612,183628,183649-183650,183660-183664,183667,183675,183689-183690,183693-183694,183733,183744,183762,183764,183806-183811,183814,183817,183822,183827-183828,183830-183834,183859,183871,183894-183896,183923,183966,183970,183973,183976,183980,183982,184026-184027,184030-184031,184060,184067,184069,184073-184074,184089,184095-184097,184101-184104,184106-184108,184139,184141,184146,184151,184161,184169-184170,184181,184183,184192,184207,184211-184213,184227,184230-184231,184240-184243,184245,184253-184254,184258,184263-184264,184293,184298,184304,184309-184310,184333,184336,184340,184372-184376,184378,184380,184382,184408-184409,184428,184482-184483,184488-184489,184492,184501,184508,184510,184534,184536,184540,184544-184545,184552,184600-184601,184625,184649,184652,184660-184661,184691,184700,184734,184743,184825,184828-184829,184870,184883,184897,184904,184908,184933-184934,184937,184948,184974-184976,184981,184991,185002,185006-185008,185012,185014-185015,185035-185036,185048,185070,185082,185103,185108-185109,185133,185140,185170,185176-185179,185182-185183,185225,185230,185236,185244,185268-185269,185271-185273,185276,185285-185286,185293,185295,185327-185330,185332-185333,185335,185341,185343-185344,185354,185358,185366,185370-185371,185404,185435-185436,185438,185441-185442,185451,185460,185478,185484,185494,185497,185506,185508,185515,185517,185538,185540,185542,185545,185548,185554,185556-185557,185561,185575-185577,185583-185584,185586,185589,185593,185596-185597,185634-185635,185642,185647,185652,185655,185692-185694,185707,185713,185723,185739,185747,185750,185752-185753,185756,185758,185761,185764-185766,185774,185776,185779-185781,185784,185791,185807,185812-185813,185849,185855,185857-185858,185864,185874,185878,185892-185893,185896-185901,185903,185928,185962,185964-185965,185983-185984,185987,185994,185999,186009,186026,186031,186051-186052,186061,186073,186086,186093,186132,186140-186141,186145-186146,186154,186165,186168-186169,186179,186184-186185,186188-186189,186194,186210-186211,186214,186222-186223,186260,186262,186276,186278,186282,186290,186295,186299-186301,186318-186320,186346,186371,186386,186389-186390,186393,186395-186396,186403,186430,186433-186434,186465-186466,186503,186510-186511,186517,186529,186560-186561,186563-186565,186570,186587,186600-186601,186603,186606,186662,186664,186682,186684,186715,186717,186719,186733,186740,186747,186791,186807,186822-186823,186825,186828,186851,186854,186876,186878,186882,186884,186891,186896-186898,186905,186907,186911-186912,186919,186948,186956,186980-186981,186986,187020,187028,187052-187053,187100,187103,187123,187133,187150,187154,187196,187199,187202,187204,187207-187208,187223,187243-187245,187247,187298,187317,187325,187348,187368,187375,187387,187395-187397,187405,187409-187410,187413,187417,187445,187454,187460,187467-187468,187470,187474,187481-187483,187486,187490,187495,187525,187528,187543,187546,187551,187566,187631,187648-187653,187655-187658,187667,187684,187686,187715,187721,187790,187812,187815,187836,187838,187864,187867,187875-187877,187881,187894-187895,187944,187964,187973,188018,188030,188032-188033,188040,188044,188054,188077-188078,188119,188122-188124,188132,188144,188146,188148-188149,188151,188164,188209,188216,188232,188240,188245,188251,188303,188312-188313,188315,188318,188320,188329,188345,188352,188354,188381,188395,188406-188407,188429,188452,188455-188458,188462,188464,188474-188475,188477,188485,188492,188501-188503,188510,188545-188546,188548,188550,188570,188572,188575,188579,188588,188592,188603,188608,188639,188659,188667,188670-188671,188677,188688,188700,188705,188723-188725,188731,188733,188736-188737,188750-188751,188815-188816,188831-188833,188838-188840,188844-188846,188860,188868,188879,188893,188899,188923,188932,188938,188951,188962-188963,188992,188994,189004,189017,189022-189023,189045-189054,189057,189067-189070,189073,189082,189099,189111,189117,189128,189130,189196,189232,189283,189285,189302,189305-189306,189313,189325,189362-189364,189367-189368,189373,189379,189398,189400-189401,189404,189406-189407,189411-189412,189418,189421,189423,189445-189447,189450,189490,189494,189499,189509,189545,189555,189557-189567,189570,189588,189590,189593,189595,189611,189615-189616,189627,189631,189637,189639,189643,189648-189649,189655,189657,189675,189685-189690,189693,189695,189706-189708,189714-189715,189737,189744-189745,189748-189749,189768-189769,189771,189774,189785,189795,189848,189861-189862,189867-189870,189872,189876,189878-189879,189882,189899,189908-189916,189919,189962,190003,190020-190023,190029-190030,190071,190075,190098-190099,190101,190103,190106-190109,190111-190112,190117,190123-190125,190138,190141,190146-190147,190151,190163-190164,190166,190170,190194,190206,190264,190272,190282,190303,190314,190319,190323,190325,190329,190331,190374-190376,190386-190387,190398-190401,190405,190407,190413,190423,190426,190433,190454,190469,190488,190499,190514,190519,190533,190541,190544,190550,190557,190563,190565,190587,190590,190595,190674-190675,190690,190708,190756,190783,190800,190806,190809-190810,190831,190833-190834,190839,190868-190869,190886,190895,190903,190945-190946,190982,190987,191011-191012,191061,191069,191071-191072,191076-191077,191081-191082,191113,191135-191137,191164,191217-191218,191220,191222,191260,191269,191274,191313,191315,191318-191319,191366,191405,191438-191439,191638,191716,191719,191741-191742,191794,191871,191875-191877,191880,191883,191887,191894-191895,191923,191932,191966,191972-191973,191979,191988-191989,191996,192001-192002,192012,192032,192036,192066,192094,192097,192105,192125,192127,192144,192151,192203-192206,192281,192284,192288-192292,192294,192297-192299,192342,192361,192373,192379,192418,192506,192508,192534,192537,192540,192543,192584,192593,192681,192683-192685,192706,192708-192711,192713,192716,192718-192720,192723-192728,192731,192734-192740,192742,192852,192855,192880,192882-192883,192899-192900,192933,192973,193027-193028,193131,193176,193229,193289,193291,193293-193294,193298-193299,193377,193382,193390,193535,193556-193557,193628,193719-193720,193790,193829,193880,193887,193916,193918-193919,193922-193925,193930-193931,194078,194203,194296,194356,194460,194537,194539-194540,194699,194850,194891,194993,195045,195080,195153,195188,195231 Index: stable/7/sys/geom/label =================================================================== --- stable/7/sys/geom/label (revision 195657) +++ stable/7/sys/geom/label (revision 195658) Property changes on: stable/7/sys/geom/label ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,3 +0,0 ## Reverse-merged /user/peter/kinfo/sys/geom/label:r185413-185547 Reverse-merged /head/sys/geom/label:r167515,167524-167529,167538,167560-167561,167566,167655,167734,167746,167751,167760,167762,167769,167840,167847-167848,167862,168351,168490-168492,168496,168499,168505,168539-168540,168620,168642,168644,168646,168650,168736-168737,168748-168750,168760,168767,168770,168886,168888,168890,169052-169053,169978,169988,169990,169994,170007-170008,170037-170038,170076,170081,170083,170197,170654,170789,170869,171335,171469,171471,171803-171804,171868,171978,172096,172100-172101,172105,172109,172147,172568,172588,172613-172615,172696,172734,172738-172739,172779,172811,172857,172919,172940,172995,173081,173155,173215,173249,173336,173442,173468,173522,173573,173592,173742,173817,173846,173901,173918,173928,173970,174004,174025,174030,174051,174054,174056,174058,174104,174113-174114,174141,174150,174176,174182-174186,174193-174194,174240,174249,174267,174326,174437,174452,174456,174465,174499,174510,174543-174544,174578-174579,174596,174598,174643-174644,174654,174700,174708,174756,174758,174777,174779-174781,174799,174821,174825,174848,174882,174894,174937-174940,174982,175019-175021,175041,175053-175056,175058,175067,175105,175119-175120,175155,175162,175301,175325,175328-175329,175379-175381,175397,175404,175417,175466,175622,175666,175763,175870,175897,175903-175905,176041,176093,176203-176204,176258,176260,176264-176265,176426,176448,176471-176472,176526,176572,176577,176596,176613,176623-176624,176650,176672,176718,176724,176729-176730,176744-176745,176750,176755,176759,176797,176803,176811,176821,176859,176880,176906,176910,176935,176952,176967,176996,177041,177103-177105,177135,177181,177253,177255,177257,177261,177272,177276,177304,177325,177342,177350,177369,177373,177414,177416,177431,177457,177459,177467,177480,177489,177505,177507,177509-177510,177512,177529,177532,177534-177535,177597,177604,177612,177621,177624,177659,177662,177680-177681,177684-177685,177692,177702,177713,177738,177808,177843,177851,177862,177874,177881,177883,177886-177889,177899,177904,177916-177917,177932,177940,177943-177944,177956,177985,178001,178010,178027,178033,178046,178057,178070,178092,178109-178110,178112,178131-178132,178147,178151,178153,178155,178180,178241,178243,178247,178250,178257,178280,178285,178302,178304,178318-178322,178324-178325,178376-178378,178392,178419-178420,178444,178461,178492-178493,178585,178599-178600,178630,178637,178725,178767,178786,178795-178796,178800,178804,178814,178853,178872,178875,178893,178920,178928,178933,178935,178947,178968,178975-178976,178978,179009,179019,179060,179074,179076,179093-179094,179097,179099,179101,179141,179151,179157,179159,179164,179174-179175,179180,179196,179205,179229,179242-179243,179268,179289,179296,179308,179312-179313,179336,179338,179375,179382,179392,179408-179410,179412,179414,179423,179425,179436,179445,179458,179467,179471,179474,179487-179488,179490,179510,179517,179623,179631,179634,179637,179640,179644-179646,179653,179655,179664-179665,179670,179693,179695,179705,179715-179716,179720,179722,179745,179747-179752,179755-179756,179763,179765,179771,179777,179781,179783,179786-179787,179803,179806,179808,179831-179833,179853,179860,179879,179881,179887,179894-179896,179898,179917,179921,179923,179925,179967-179969,179971,179973,179977-179978,180010,180025,180032,180037-180038,180042,180059,180062,180064,180069,180072-180073,180077,180090,180098-180099,180101,180108,180110,180127,180131-180132,180139,180145,180152-180153,180166-180178,180198,180210-180211,180215,180217,180220,180233,180249,180252-180253,180255,180262,180268,180298-180299,180304-180308,180312-180313,180326,180333,180336-180338,180340,180343-180344,180346,180348,180352,180356-180358,180362,180365,180368,180371,180373-180374,180376-180378,180382-180387,180389-180392,180422,180425,180427-180429,180433,180437,180445-180447,180453,180484,180486,180495,180498,180503,180513,180515,180532,180536,180551-180552,180558,180567,180570,180580,180582-180584,180586,180589,180598,180600,180607,180610,180612,180616,180629,180633,180639,180644,180647,180649-180651,180664,180668,180673,180675,180686,180692,180699,180701,180703-180704,180706,180708-180709,180711-180712,180715-180716,180735,180738,180743,180753-180754,180756,180758,180760,180779-180781,180791,180799,180840,180846,180869,180879,180923,180937,180946,180950,180952,180954-180957,180965,180968,180981-180982,180990,180992,181000,181002,181007,181016,181018,181020,181024,181040,181053-181054,181060,181069,181089,181093,181126,181129,181132,181137,181139,181163,181235,181254,181270-181275,181282,181286,181295,181297,181300-181301,181330,181333-181334,181336-181337,181345,181347,181364-181365,181381,181394,181398-181399,181430,181432-181433,181436,181463-181464,181467,181524,181528,181556-181557,181593,181603-181604,181606,181617-181619,181627,181635,181640,181642,181644-181645,181647-181649,181655,181683-181685,181691,181693,181697,181700-181701,181717,181740,181753,181782,181791,181823-181824,181839,181841,181843-181844,181846,181848,181853,181868,181875,181885,181925,181931,181933-181934,181953,181964,181966,181970,181972-181976,181987,181992,182003,182011,182015,182018,182020,182025,182045-182048,182055-182056,182059-182062,182066,182070,182078-182081,182085,182090,182106,182108,182110-182112,182114-182115,182118-182120,182122,182153,182161,182172-182173,182193,182201,182220,182268,182292-182293,182311,182321-182322,182364-182367,182376,182380,182391,182401,182403,182405,182413,182424,182433,182441,182461,182463,182467-182469,182476-182478,182488,182524,182537,182555,182600,182670,182682,182684,182688-182689,182691,182713,182722,182729-182730,182739,182743,182750,182754,182766-182769,182773-182774,182777,182781,182783,182799,182808,182824,182840,182849,182854-182855,182865-182868,182875-182880,182883-182885,182887-182888,182890,182892,182896,182908,182910,182913,182915-182916,182918,182936,182947,182959-182961,182967,182995,182999,183001,183005,183013-183014,183017,183019,183024-183025,183032,183034,183067,183070-183074,183078-183080,183093,183095,183097,183128,183135,183142,183144,183151-183152,183169,183190,183194,183201-183204,183207,183211-183216,183236,183264-183265,183280-183281,183288,183298,183322-183323,183330-183331,183337,183346,183351,183356,183363,183365,183380,183383,183397-183398,183410-183413,183418-183420,183423,183454-183455,183460-183461,183485-183486,183488-183493,183503-183505,183509,183512,183515,183518-183519,183539,183552,183555,183558,183561,183563,183567,183571-183573,183587,183590,183600,183603-183606,183610-183612,183628,183649-183650,183660-183664,183667,183675,183689-183690,183693-183694,183733,183744,183762,183764,183806-183811,183814,183817,183822,183827-183828,183830-183834,183859,183871,183894-183896,183923,183966,183970,183973,183976,183980,183982,184026-184027,184030-184031,184060,184067,184069,184073-184074,184089,184095-184097,184101-184104,184106-184108,184139,184141,184146,184151,184161,184169-184170,184181,184183,184192,184207,184211-184213,184227,184230-184231,184240-184243,184245,184253-184254,184258,184263-184264,184293,184298,184304,184309-184310,184333,184336,184340,184372-184376,184378,184380,184382,184408-184409,184428,184482-184483,184488-184489,184492,184501,184508,184510,184534,184536,184540,184544-184545,184552,184600-184601,184625,184649,184652,184660-184661,184691,184700,184734,184743,184825,184828-184829,184870,184883,184897,184904,184908,184933-184934,184937,184948,184974-184976,184981,184991,185002,185006-185008,185012,185014-185015,185035-185036,185048,185070,185082,185103,185108-185109,185133,185140,185170,185176-185179,185182-185183,185225,185230,185236,185244,185268-185269,185271-185273,185276,185285-185286,185293,185295,185327-185330,185332-185333,185335,185341,185343-185344,185354,185358,185366,185370-185371,185404,185435-185436,185438,185441-185442,185451,185460,185478,185484,185494,185497,185506,185508,185515,185517,185538,185540,185542,185545,185548,185554,185556-185557,185561,185575-185577,185583-185584,185586,185589,185593,185596-185597,185634-185635,185642,185647,185652,185655,185692-185694,185707,185713,185723,185739,185747,185750,185752-185753,185756,185758,185761,185764-185766,185774,185776,185779-185781,185784,185791,185807,185812-185813,185849,185855,185857-185858,185864,185874,185878,185892-185893,185896-185901,185903,185928,185962,185964-185965,185983-185984,185987,185994,185999,186009,186026,186031,186051-186052,186061,186073,186086,186093,186132,186140-186141,186145-186146,186154,186165,186168-186169,186179,186184-186185,186188-186189,186194,186210-186211,186214,186222-186223,186260,186262,186276,186278,186282,186290,186295,186299-186301,186318-186320,186346,186371,186386,186389-186390,186393,186395-186396,186403,186430,186433-186434,186465-186466,186503,186510-186511,186517,186529,186560-186561,186563-186565,186570,186587,186600-186601,186603,186606,186662,186664,186682,186684,186715,186717,186719,186733,186740,186747,186791,186807,186822-186823,186825,186828,186851,186854,186876,186878,186882,186884,186891,186896-186898,186905,186907,186911-186912,186919,186948,186956,186980-186981,186986,187020,187028,187052-187053,187100,187103,187123,187133,187150,187154,187196,187199,187202,187204,187207-187208,187223,187243-187245,187247,187298,187317,187325,187348,187368,187375,187387,187395-187397,187405,187409-187410,187413,187417,187445,187454,187460,187467-187468,187470,187474,187481-187483,187486,187490,187495,187525,187528,187543,187546,187551,187566,187631,187648-187653,187655-187658,187667,187684,187686,187715,187721,187790,187812,187815,187836,187838,187864,187867,187875-187877,187881,187894-187895,187944,187964,187973,188018,188030,188032-188033,188040,188044,188054,188077-188078,188119,188122-188124,188132,188144,188146,188148-188149,188151,188164,188209,188216,188232,188240,188245,188251,188303,188312-188313,188315,188318,188320,188329,188345,188352,188354,188381,188395,188406-188407,188429,188452,188455-188458,188462,188464,188474-188475,188477,188485,188492,188501-188503,188510,188545-188546,188548,188550,188570,188572,188575,188579,188588,188592,188603,188608,188639,188659,188667,188670-188671,188677,188688,188700,188705,188723-188725,188731,188733,188736-188737,188750-188751,188815-188816,188831-188833,188838-188840,188844-188846,188860,188868,188879,188893,188899,188923,188932,188938,188951,188962-188963,188992,188994,189004,189017,189022-189023,189045-189054,189057,189067-189070,189073,189082,189099,189111,189117,189128,189130,189196,189232,189283,189285,189302,189305-189306,189313,189325,189362-189364,189367-189368,189373,189379,189398,189400-189401,189404,189406-189407,189411-189412,189418,189421,189423,189445-189447,189450,189490,189494,189499,189509,189545,189555,189557-189567,189570,189588,189590,189593,189595,189611,189615-189616,189627,189631,189637,189639,189643,189648-189649,189655,189657,189675,189685-189690,189693,189695,189706-189708,189714-189715,189737,189744-189745,189748-189749,189768-189769,189771,189774,189785,189795,189848,189861-189862,189867-189870,189872,189876,189878-189879,189882,189899,189908-189916,189919,189962,190003,190020-190023,190029-190030,190071,190075,190098-190099,190101,190103,190106-190109,190111-190112,190117,190123-190125,190138,190141,190146-190147,190151,190163-190164,190166,190170,190194,190206,190264,190272,190282,190303,190314,190319,190323,190325,190329,190331,190374-190376,190386-190387,190398-190401,190405,190407,190413,190423,190426,190433,190454,190469,190488,190499,190514,190519,190533,190541,190544,190550,190557,190563,190565,190587,190590,190595,190674-190675,190690,190708,190756,190783,190800,190806,190809-190810,190831,190833-190834,190839,190868-190869,190886,190895,190903,190945-190946,190982,190987,191011-191012,191061,191069,191071-191072,191076-191077,191081-191082,191113,191135-191137,191164,191217-191218,191220,191222,191260,191269,191274,191313,191315,191318-191319,191366,191405,191438-191439,191638,191716,191719,191741-191742,191794,191871,191875-191877,191880,191883,191887,191894-191895,191923,191932,191966,191972-191973,191979,191988-191989,191996,192001-192002,192012,192032,192036,192066,192094,192097,192105,192125,192127,192144,192151,192203-192206,192281,192284,192288-192292,192294,192297-192299,192342,192361,192373,192379,192418,192506,192508,192534,192537,192540,192543,192584,192593,192681,192683-192685,192706,192708-192711,192713,192716,192718-192720,192723-192728,192731,192734-192740,192742,192852,192855,192880,192882-192883,192899-192900,192933,192973,193027-193028,193131*,193176,193229,193289,193291,193293-193294,193298-193299,193377,193382,193390,193535,193556-193557,193628,193719-193720,193790,193829,193880,193887,193916,193918-193919,193922-193925,193930-193931,194078,194203,194296,194356,194460,194537,194539-194540,194699,194850,194891,194993,195045,195080,195153,195188,195231 Reverse-merged /user/kmacy/releng_7_2_fcs/sys/geom/label:r195299 Index: stable/7/sys =================================================================== --- stable/7/sys (revision 195657) +++ stable/7/sys (revision 195658) Property changes on: stable/7/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys:r193131