Page MenuHomeFreeBSD

MFC'ing r282212 from Head to 10 stable branch
AbandonedPublic

Authored by whu on May 18 2015, 7:12 AM.

Details

Reviewers
royger
Summary

MFC r282212 Microsoft vmbus, storage and other related driver
enhancements for HyperV.

Test Plan

Tested by Microsoft OSTC team.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

whu retitled this revision from to MFC'ing r282212 from Head to 10 stable branch.
whu updated this object.
whu edited the test plan for this revision. (Show Details)

I trust you that the backport is right, but I see a bunch of added mergeinfo data which I'm not sure if it's an artifact of the review system:

Merged /projects/lldb-r201577/sys:r262185-262527
Merged /stable/10/usr.bin/head/sys:r265256
Merged /projects/clang-sparc64/sys:r262258-262612
Merged /projects/pf/head/sys:r263908
Merged /projects/elftoolchain/sys:r260880
Merged /projects/zfsd/head/sys:r266519,269993
Merged /head/sys:r256280,256291,256293-256294,256299,256302,256304,256308,256321-256323,256325,256327-256328,256330-256331,256333-256335,256338,256341,256343,256345,256347-256348,256350,256362,256365,256385,256389,256391,256423,256425,256430,256440,256446,256448,256450,256459,256467,256470,256477,256489,256492,256498-256502,256504,256510,256512,256514,256533,256537,256539-256544,256546-256549,256551-256553,256555-256557,256561,256570-256571,256581,256603,256606-256607,256610,256614,256628,256637-256638,256640,256642,256645-256647,256650,256657-256658,256661,256666,256670,256672,256682,256687,256689-256691,256694-256695,256705,256707-256709,256711,256713-256718,256720-256722,256724,256735,256743-256746,256748,256750,256752-256753,256760-256771,256773-256779,256782,256788,256790,256792-256793,256798-256801,256803-256804,256806,256808-256809,256812-256818,256822,256826-256828,256830,256832-256833,256835-256836,256838-256839,256842-256843,256845-256848,256855,256860-256861,256864-256865,256868,256870-256871,256873,256875,256878,256880,256885,256887-256889,256893,256895,256898-256901,256911-256912,256914-256915,256919-256920,256925-256926,256931-256932,256934-256939,256941-256943,256945,256948-256951,256953,256955-256956,256959-256961,256963,256966-256969,256971-256975,256977-256978,256994-256995,256999,257005-257007,257015-257018,257029,257036-257038,257051,257054-257055,257057,257059-257062,257064-257065,257069-257072,257075,257078-257079,257084,257092-257093,257095-257100,257105,257109,257111,257114-257118,257127,257129-257130,257132,257138-257139,257142-257152,257155,257157-257159,257161-257162,257164,257167-257172,257175,257178,257180,257183,257186,257189-257191,257193,257195-257203,257206-257207,257209-257210,257214-257217,257221-257222,257228,257230-257231,257233-257235,257240,257248,257251,257258,257265-257266,257268,257272,257274,257276-257282,257287-257288,257291,257293,257295,257297-257300,257302,257304-257308,257315,257329,257332,257334-257338,257340-257345,257347,257349-257350,257359,257361,257364,257368-257370,257376-257384,257388,257390,257393,257399-257400,257402-257403,257407-257411,257413-257414,257416-257419,257421-257423,257429,257435,257440,257447,257452-257454,257469,257472,257475-257478,257480,257482-257487,257489-257490,257501,257504-257505,257511-257512,257515-257516,257518-257519,257532,257534,257539,257541-257543,257549,257555-257557,257561,257574,257582-257583,257594-257595,257598,257600,257603-257604,257619-257620,257631,257633,257637,257639,257641,257643,257648-257650,257654,257656,257660-257661,257667-257670,257672-257673,257676,257678-257680,257686,257694-257695,257702,257705,257712,257729-257730,257732,257734,257738-257740,257743,257745-257749,257751,257754-257757,257767,257769-257770,257772,257774-257775,257777,257779-257785,257787-257796,257800-257801,257803-257808,257817-257821,257823-257830,257838,257841-257854,257856,257858-257860,257862-257864,257869-257870,257872-257874,257876-257877,257883,257888,257892,257896,257898-257904,257910,257913-257916,257920,257924,257929-257930,257932-257933,257936-257942,257945-257946,257955,257957-257958,257965,257985,257987,257991-257993,257995-257996,258000-258003,258005,258014,258016-258017,258021,258024-258025,258027-258029,258036,258039,258041-258047,258050-258052,258054,258056-258057,258063-258064,258066,258069,258071,258075-258082,258084,258086,258088,258094-258098,258101,258113-258115,258119,258122,258128,258132,258135,258137-258138,258143,258148-258150,258152-258157,258162,258164,258167-258170,258173,258176-258179,258181,258185,258187,258195-258197,258199-258202,258204-258207,258209-258211,258220-258221,258224,258227-258228,258232-258233,258235,258240,258243-258244,258246-258247,258250-258251,258254,258256-258257,258259,258262-258272,258274-258276,258281,258283,258285-258287,258289-258291,258294,258297-258299,258305,258307-258311,258314,258316-258321,258330-258332,258336-258338,258340,258342,258345,258347-258348,258350-258360,258362-258367,258387-258388,258390,258392-258393,258397,258399-258401,258406-258407,258410-258412,258418,258425,258427-258430,258432-258433,258436,258439,258441,258445,258448,258458,258469,258471,258475-258480,258489,258492,258494-258495,258497,258501,258503-258504,258507,258527,258530,258533,258535,258537,258545-258547,258549,258551-258553,258569-258570,258573-258574,258578-258582,258587-258592,258602,258605,258609,258614-258615,258617-258619,258622,258625,258628-258634,258638,258641-258643,258647-258648,258651,258658-258662,258664,258668-258669,258673,258675,258677-258679,258683,258689-258694,258696-258699,258702,258704-258705,258708-258709,258711-258717,258720,258722,258727-258728,258731-258733,258737,258739-258746,258748,258757-258758,258765,258770,258776,258778-258780,258785-258787,258789-258790,258793-258794,258796-258798,258800,258802,258805-258807,258817,258819-258820,258826,258828,258830,258840,258845,258847,258851,258853-258855,258857,258859-258860,258869,258871,258873,258879,258884,258892-258893,258897,258901-258902,258904,258914,258919,258921,258924,258927-258928,258930-258931,258941,258943,258950,258956,259003,259005,259007,259010,259013-259014,259016,259019,259022-259023,259029-259039,259042-259044,259046-259049,259052-259054,259056-259058,259060,259071-259072,259079,259081-259085,259088-259090,259092,259094-259095,259099-259104,259107-259111,259113,259115,259117-259118,259121-259122,259125-259127,259129-259134,259140,259143-259145,259148,259156,259168,259178-259180,259182-259183,259191-259197,259199,259202-259203,259205,259208-259213,259220-259222,259232,259240,259244-259248,259261,259265-259267,259270,259274-259276,259284,259286-259287,259302,259330-259331,259339,259362,259382,259393-259395,259400,259407,259411,259413,259417,259421,259424-259429,259441,259462,259464,259468-259470,259472-259474,259476-259478,259480-259482,259484,259490,259493,259498,259502,259513-259514,259516-259518,259520-259522,259525-259529,259531-259532,259535,259537,259542-259547,259549-259550,259555,259558,259562,259566,259569-259574,259576,259586-259589,259597-259598,259609,259612,259615,259626,259632-259635,259638,259640-259641,259645,259649-259651,259655,259657,259659,259662-259663,259666-259668,259674-259675,259677,259679-259681,259684-259686,259696,259699,259702,259708-259720,259724,259727-259730,259732-259733,259735-259737,259739-259740,259743-259744,259749-259750,259756,259761-259767,259771-259772,259776-259777,259779-259782,259792,259801,259808,259811-259813,259816,259823,259825-259828,259830,259833,259838-259846,259850,259854-259855,259860,259863,259868-259870,259872-259877,259879-259882,259884-259888,259892-259893,259896-259897,259902,259906,259908,259910,259913,259915-259916,259920-259922,259924-259929,259936-259937,259939-259940,259942-259944,259946,259950-259951,259953,259955,259959,259961,259973,259978,259997-259998,260003,260009,260014-260017,260019-260020,260023,260025-260026,260028,260031,260036,260038-260059,260061,260063-260064,260066-260070,260076,260079,260083,260086-260089,260092-260093,260095,260097,260099,260102-260106,260110-260113,260118,260121,260124-260125,260132,260138,260141-260142,260145,260150-260151,260156-260157,260160-260161,260163,260165-260167,260175,260180-260181,260183-260185,260187-260189,260204-260207,260210,260217,260219-260220,260225,260228-260229,260232-260239,260243,260245-260247,260255,260257-260258,260260-260262,260267,260281-260283,260285,260288,260290,260292,260294-260295,260310-260311,260315,260320,260322-260323,260326-260328,260331-260334,260336,260340,260355,260358,260361,260367,260369,260371-260375,260377,260379-260383,260388-260390,260397,260401,260403,260407,260410,260415,260429,260440-260441,260444-260447,260449-260450,260457,260459-260460,260463,260466,260469,260481,260483-260486,260488,260490-260491,260493-260494,260496,260505-260506,260508-260509,260521-260526,260531-260532,260534-260536,260540-260542,260547,260549-260550,260553,260556-260557,260559,260563,260566-260567,260571,260576-260577,260581-260584,260586,260588-260589,260594-260597,260600,260605,260607,260610,260619,260621,260632-260637,260648,260653-260655,260666,260688,260691,260695-260696,260701-260704,260706,260713,260717,260752,260772,260782,260791,260793,260796,260800-260802,260808,260811-260812,260814,260830-260831,260833,260835-260836,260847,260863,260866,260871-260872,260883-260890,260893-260894,260899-260900,260903-260904,260910-260911,260913-260914,260921,260926,260934,260942,260949,260953,260972-260973,260976-260977,260987,260996,260999-261001,261003-261005,261024,261027-261030,261032-261033,261037-261042,261068,261072,261074-261075,261080-261081,261083-261086,261089,261091-261092,261094-261095,261117-261118,261121-261134,261137-261138,261140-261141,261146-261147,261149-261151,261160-261173,261175,261178,261189,261192-261200,261211-261212,261214-261217,261224,261227-261230,261233-261234,261243,261247,261252,261257-261258,261260-261263,261267-261271,261279,261283-261284,261290-261291,261294,261296,261299-261302,261304-261305,261309,261315,261318-261322,261330,261336-261340,261342-261343,261345,261351-261355,261357-261358,261393-261398,261400-261401,261403-261406,261409-261424,261432,261435-261440,261442,261444-261447,261449,261453,261459,261479,261487,261491,261493-261494,261496-261497,261499-261501,261503-261507,261511-261518,261520-261522,261524-261531,261533-261538,261541-261544,261546-261547,261549-261553,261558,261562-261568,261570,261572,261577,261582-261586,261589-261593,261595-261599,261601,261603-261604,261606-261611,261613-261618,261620-261621,261627,261638-261643,261646-261651,261655-261657,261663,261668,261676-261677,261680-261690,261698,261701-261702,261708,261710-261715,261719,261722-261725,261742,261747-261768,261773-261774,261778,261780-261781,261783,261785-261786,261789-261791,261795-261797,261799-261801,261803-261805,261808,261814-261819,261823-261827,261832-261838,261841-261848,261855,261858-261859,261861,261863,261867,261872,261875,261882-261885,261890,261892-261905,261907-261908,261911,261913-261922,261931-261932,261934,261937-261940,261944-261947,261955-261960,261962,261977-261978,261981-261983,261987,261991,262000,262005-262006,262020,262027-262030,262036,262121,262123,262125,262128-262129,262133,262135-262136,262139-262140,262142-262144,262162,262184,262186,262194,262209,262220,262236,262242-262244,262247,262250-262252,262273-262274,262277-262278,262280-262281,262294,262296,262303,262309-262311,262324-262334,262337-262338,262340-262341,262343-262345,262347,262351,262353-262355,262393-262394,262398-262401,262408-262411,262413,262417-262420,262424-262427,262439-262442,262447,262451,262454-262456,262461-262465,262467,262471-262472,262477-262478,262480,262482-262484,262487-262488,262494-262495,262499,262501-262502,262505-262507,262509,262513,262522-262523,262525,262528,262531-262534,262539-262540,262542-262543,262547-262555,262559,262565,262568,262571-262572,262574-262575,262577,262581,262583-262585,262587,262591-262593,262596-262601,262603,262606-262611,262613-262615,262624-262627,262645-262647,262655,262657,262661,262663-262666,262669,262676,262682,262689-262690,262694-262697,262708-262712,262714,262719,262725-262726,262728,262732-262733,262736,262741,262744,262746-262748,262750,262752,262754-262755,262760,262763,262767,262769-262771,262775,262782,262785,262789,262795,262799,262805-262806,262809-262810,262812,262814,262819,262822,262837,262847,262862,262864-262865,262867-262868,262870,262872,262877,262880,262884-262886,262890-262891,262894-262905,262908-262910,262912,262914,262916,262918-262921,262924-262925,262929-262930,262932,262935-262936,262940-262942,262945,262948-262950,262952-262954,262958-262962,262966,262972,262975,262979-262980,262982,262984-262987,262989,262991,262995,262997,262999,263005,263021,263030,263033-263036,263041,263048-263049,263052,263054,263056-263057,263059,263062,263079-263085,263087,263089-263092,263094-263096,263105-263107,263113-263118,263120-263121,263123-263124,263129-263131,263133-263137,263139-263141,263144-263150,263153-263155,263159-263161,263169,263172-263175,263180-263181,263183-263193,263195,263199,263203-263204,263207,263210-263211,263217,263220-263222,263226-263227,263230-263234,263236-263239,263242-263246,263248-263254,263257,263259,263264-263265,263267,263271,263275-263278,263280,263287-263292,263297,263301-263306,263310-263313,263317,263320,263322-263323,263329,263331-263332,263345-263346,263348-263349,263351-263353,263356,263362,263373,263380,263385,263388,263412,263423-263432,263434-263435,263445-263446,263451,263457-263460,263464,263468,263471,263475,263497-263498,263530,263631-263632,263637,263649-263650,263658,263664,263676,263678-263679,263686,263690,263692-263694,263698,263704,263710-263712,263738,263740,263742-263745,263749,263752-263753,263755,263758,263772,263774-263775,263777-263780,263795,263810-263812,263814-263815,263822,263826,263833,263842,263846-263847,263859,263863,263872-263873,263878-263879,263881,263885,263889-263891,263901,263910,263912-263914,263918-263919,263921-263926,263928,263933-263937,263948-263949,263952,263957,263966,263968-263969,263971,263978-263979,263981-263983,263986,263989-263990,263998,264007-264013,264016-264020,264022-264031,264039,264041,264046,264048-264052,264054-264059,264062,264065,264067-264068,264073,264077-264078,264082-264084,264086-264088,264090-264092,264094-264097,264099-264103,264105,264107,264109-264110,264114-264115,264119-264120,264122,264124-264133,264135,264137-264138,264142,264145-264146,264149-264151,264153,264160-264164,264173-264174,264177,264179-264183,264189-264191,264193-264194,264197,264203-264208,264212-264213,264215,264218-264220,264229-264230,264235,264238,264241-264244,264248,264251,264257-264259,264261-264264,264269,264274-264283,264291,264293-264297,264302,264304,264307-264308,264310-264311,264313-264321,264324,264327,264340-264349,264351,264353-264356,264361-264364,264367,264384-264386,264389,264391-264392,264400,264403-264408,264410,264412-264422,264428,264434-264436,264448,264453,264460-264461,264465,264467-264469,264471,264479-264482,264486,264488-264489,264494,264498-264501,264504,264507,264509,264514-264518,264520,264524-264540,264542,264544-264545,264549-264550,264552,264573,264582,264585,264600-264601,264604-264605,264608-264610,264617,264620-264621,264628,264630-264631,264646,264648,264650-264651,264653,264655-264656,264669,264671-264672,264679,264681-264682,264686,264689,264691,264694,264696-264698,264701-264705,264709,264721,264731,264738-264742,264749,264765-264766,264768-264770,264772,264781,264794-264795,264800-264803,264822,264825-264828,264831-264832,264834-264838,264840-264842,264845-264846,264849-264853,264856-264861,264863-264865,264867,264876-264881,264883-264888,264891-264892,264905,264907-264909,264912,264916-264918,264921-264923,264927,264933-264935,264963-264964,264966,264968,264970,264972,264975,264977-264979,264981-264985,264988,264990,264992,264994-264995,264999,265002-265004,265012-265017,265020,265023-265025,265028,265035-265036,265038,265042,265046,265054,265057-265059,265062-265063,265072,265085,265090,265092,265094,265097-265102,265107,265111,265114,265148-265150,265152,265154-265157,265159,265162-265163,265165,265170-265171,265191,265193-265194,265197,265201,265203,265206-265208,265211,265218,265229-265230,265232,265236-265242,265244,265248-265256,265260-265264,265267,265269-265270,265275-265276,265285,265287,265289,265308,265310,265318,265320-265321,265323,265329,265331,265333,265336,265358-265360,265362-265366,265371,265376,265385-265386,265391-265392,265395,265397-265398,265402-265403,265407,265411,265418,265424,265427,265440-265442,265444-265447,265454-265456,265458,265462-265465,265467-265468,265473,265477,265484-265485,265534-265535,265539,265546,265555,265578,265583,265585,265590,265593-265595,265599,265601-265603,265605,265607,265624,265629-265631,265680-265681,265689-265691,265694,265703,265705,265709,265712-265713,265716,265719,265732,265739,265766,265776-265780,265783-265784,265798,265806,265811,265815,265817,265821-265822,265824-265825,265829,265836,265840,265843,265845,265847,265850,265852-265853,265861-265864,265867,265870-265872,265876,265883,265886-265887,265900,265909,265913-265915,265923,265925-265927,265931,265941-265943,265948,265951,265978,265995,266006-266007,266010-266012,266053,266074,266083,266091-266092,266103-266104,266107-266109,266111,266114,266116,266125,266136,266138-266143,266145,266147,266149-266150,266166,266169,266171,266174,266176-266177,266179-266180,266193,266195,266206,266208-266209,266225,266238,266248,266261,266263,266267,266270,266281,266285,266291,266293,266296-266297,266319-266320,266322-266323,266335-266336,266390,266394,266396,266399,266411,266416-266418,266424,266426,266444-266445,266448,266463-266464,266466,266468,266471-266473,266475-266476,266479,266483-266484,266490-266491,266494-266495,266497,266505,266509-266514,266520,266524,266527-266529,266533-266535,266538,266540-266542,266550-266556,266565,266571-266573,266587,266595-266597,266605-266606,266609,266615,266618-266621,266626-266627,266630,266633,266639,266641-266642,266647,266650-266651,266664,266671,266674,266708-266709,266721,266724-266725,266728,266731,266735-266736,266738,266744,266746,266757,266760,266765,266771-266772,266774-266775,266777-266778,266780,266782,266792-266793,266798-266800,266803,266808,266813-266814,266820-266822,266826-266828,266833,266835-266836,266838-266839,266841-266842,266846-266848,266851,266856-266857,266859-266863,266866,266878-266880,266895,266901-266903,266907-266908,266910,266915,266922-266924,266931,266933-266935,266937-266938,266943,266950-266951,266960,266969,266971,266981,266990,267004,267007,267009,267011-267012,267021,267029,267035,267038,267041,267044,267051,267060,267062,267066-267067,267078-267079,267082,267089-267090,267097-267099,267101,267105,267109,267118-267120,267123-267124,267126-267127,267131-267133,267141,267145-267146,267153,267160,267162,267169,267172-267174,267176,267178-267179,267181,267183-267185,267191,267194,267196,267210-267213,267216,267221,267223,267226-267228,267232,267239-267240,267252-267256,267264-267265,267276,267278,267290-267292,267294,267298,267300-267301,267306,267310-267311,267313,267319,267321,267324,267326-267327,267329-267331,267335-267338,267342,267351,267355-267360,267362,267366,267368,267372-267374,267376,267378,267387,267390-267392,267395,267400,267423,267426,267429,267436-267439,267441,267451,267464,267473,267478-267479,267481-267483,267485-267486,267490-267493,267496-267500,267506,267511-267516,267519-267524,267537,267544,267547,267551,267554,267558-267559,267564,267572,267574,267577-267578,267582,267597,267599-267601,267603,267606,267608-267618,267622-267627,267629-267630,267632,267634,267636-267641,267643,267647-267648,267651,267661-267664,267669-267674,267680,267682,267688-267689,267692-267693,267703-267706,267712,267719,267745,267756-267757,267759,267761,267766-267768,267785,267800-267801,267811-267812,267814-267815,267833-267834,267838-267839,267851-267852,267854,267859,267865-267867,267869,267871-267873,267875,267877,267883-267884,267886-267887,267897,267905-267906,267909,267912,267915,267918-267921,267929,267933-267934,267937,267939-267942,267949,267952,267955,267959-267961,267963,267965-267968,267970,267973,267978,267981-267982,267984-267987,267992-267993,268000-268003,268005-268006,268008,268012,268014,268017-268018,268022,268024-268025,268045,268049-268050,268059,268066,268071-268072,268074-268075,268078-268080,268082-268090,268095-268097,268103,268114-268116,268123,268125-268126,268128,268130,268134-268136,268156,268158-268160,268169,268172,268175,268178,268182,268185,268187,268193,268196,268202-268205,268209,268211-268212,268215,268224,268230-268232,268236,268238,268240,268246,268256,268264-268266,268268,268272-268273,268275-268276,268280,268283-268284,268286-268293,268295,268298-268300,268302-268303,268306-268309,268314-268316,268326-268328,268330,268336-268342,268350,268353-268354,268356-268357,268361-268365,268369-268370,268373,268376,268381,268383-268385,268387-268388,268391-268393,268395,268398,268401-268402,268407,268418-268421,268427-268429,268437,268445-268447,268450,268457,268460,268463-268464,268466-268467,268469-268476,268480-268481,268487-268488,268490,268492-268493,268495,268502,268505,268507,268514,268521,268524-268527,268531-268532,268534,268536-268538,268540-268541,268544,268565,268569-268570,268576,268581-268585,268587-268591,268593,268597,268601,268605-268617,268621,268624-268625,268631-268640,268642-268644,268646,268660,268671,268701,268706,268711-268713,268715,268720,268722,268725-268728,268735,268764-268767,268771-268772,268774,268776-268777,268780,268787,268795-268796,268798-268799,268801-268802,268806-268808,268811-268812,268817,268825,268827,268834-268836,268839-268840,268842-268843,268854-268855,268857-268860,268863-268867,268877-268878,268880,268883,268888-268890,268893,268895,268898,268921-268922,268924,268926,268928-268931,268945,268947-268949,268954,268957,268960,268971,268973-268975,268977,268979,268981-268983,268985-268986,268989,268993-268994,268997-268999,269001,269008,269015-269016,269020-269021,269023,269027,269029,269032,269036,269042-269043,269050-269054,269058,269074-269077,269079-269081,269086,269088-269089,269091-269094,269097-269098,269100,269106,269108-269109,269115-269116,269118,269122-269127,269134,269138-269139,269143,269149,269159-269161,269180,269183-269194,269197,269204-269217,269221,269228-269230,269233,269239-269240,269242,269244,269278,269281-269282,269289-269293,269302-269303,269306,269314,269316-269318,269337-269339,269341,269347,269351-269355,269362-269366,269368,269376,269387,269390,269392-269396,269403-269405,269407-269411,269413-269414,269423-269425,269428,269430-269431,269433,269436-269438,269440-269442,269444-269445,269448,269450,269457,269460,269466,269469-269472,269475,269481,269485,269487-269488,269492,269497,269502,269522,269524-269525,269527-269528,269533-269534,269537,269543,269565-269567,269569,269575-269576,269578,269583,269585,269587,269594,269596-269598,269601,269604-269609,269613,269615,269620,269622,269627,269631,269634,269636,269642-269644,269646,269653,269656,269662,269669,269674,269682,269685,269688,269695,269698,269700-269701,269708,269728,269731,269740,269743-269746,269750,269758-269759,269769-269771,269775-269777,269779-269780,269783,269788,269791,269806,269809-269811,269815,269822,269833,269838-269840,269842,269844,269852-269854,269858-269859,269865,269867,269871,269873,269875,269882,269884,269888,269896,269899,269901,269903-269904,269906-269909,269945,269948,269950,269952-269954,269956,269962-269964,269973-269974,269976-269978,269983-269984,269989,269998,270004-270005,270010-270011,270019,270022-270025,270027-270028,270038,270062,270065,270096,270098,270114,270116-270119,270131,270133-270135,270142,270144-270146,270151-270153,270155-270156,270160,270162,270165,270176,270179-270180,270183,270189-270192,270199-270200,270202-270204,270207,270209-270210,270215-270216,270222,270229-270230,270232,270234,270239,270247-270249,270251,270253,270256,270259-270260,270265,270268-270269,270271-270273,270275-270276,270278-270283,270288-270290,270293,270299-270301,270303-270304,270311,270320-270322,270324,270326-270327,270329,270331,270336,270338,270340-270343,270345,270348-270349,270383-270384,270387-270388,270390,270392,270399,270402,270404-270406,270411-270413,270416-270418,270423,270431-270434,270436-270437,270443,270445-270446,270448,270454-270455,270457,270485,270504-270507,270510,270512-270513,270516,270519,270521-270522,270571-270572,270587,270589,270613,270618,270620,270643,270647-270648,270650,270653,270657,270659-270661,270666-270669,270672-270674,270676-270677,270679,270689,270691,270698,270702,270705-270708,270710,270720-270722,270728,270750,270754,270757,270759,270780-270783,270785-270786,270795,270797-270798,270802-270803,270821,270823,270825-270826,270828-270830,270832-270833,270836,270844-270845,270847,270850,270855,270857-270859,270861,270863,270872,270879,270882,270885,270893,270912,270927-270928,270930-270935,270945,270947-270948,270953-270961,270973,270976,270989,270991-270993,271000,271007-271008,271017-271018,271025,271029-271030,271043,271045-271048,271050,271053-271055,271057,271073,271076-271078,271082-271084,271094,271097-271102,271108,271124,271133,271137,271140-271141,271143,271145-271147,271149,271151,271156-271157,271159,271163,271167-271169,271180,271187,271190,271192,271196-271197,271199,271201-271202,271204,271206-271209,271218-271222,271226-271228,271230,271250,271253,271255-271256,271258-271259,271261,271282-271287,271299,271307-271311,271313,271315-271317,271319-271321,271328,271331,271336,271338,271349-271354,271358,271360,271362,271365-271366,271381-271382,271385,271393-271395,271398,271403,271405,271407-271411,271422,271424,271429,271432-271434,271436-271437,271439,271443,271445-271452,271457,271459,271463-271468,271475,271480,271482-271483,271485,271487,271491-271493,271495-271496,271503,271505-271507,271526-271528,271532,271534-271536,271539,271543,271545-271546,271549-271550,271552-271553,271560,271563,271567,271571,271577,271586,271588-271589,271591,271594-271595,271597,271601,271604,271606-271607,271609-271610,271616-271617,271624,271628,271630,271635,271643-271645,271647-271649,271663-271665,271670,271672-271674,271676-271680,271682,271684,271688-271689,271692,271695-271696,271700,271702,271705,271711,271716-271718,271720-271722,271726-271728,271743,271745,271747,271754,271756,271758-271759,271761-271762,271784,271787,271789,271794,271796-271797,271802,271819,271834,271839,271845,271854,271868-271869,271871-271876,271879,271881-271882,271888-271893,271895,271899-271900,271906-271907,271909,271913,271917,271919,271921,271924,271926-271927,271930-271931,271934,271936,271940-271942,271945-271946,271949,271951,271953-271954,271957-271959,271965,271970-271972,271974-271975,271977-271978,271980,271982,271990,271992,272000,272007,272022-272023,272025,272027-272028,272033,272036-272037,272040,272043-272044,272046,272049,272051-272053,272055-272057,272059,272069-272072,272083-272084,272086-272087,272103,272105-272107,272109,272111,272127,272130,272132,272135,272137,272139-272143,272153,272165,272168,272171,272173-272174,272176,272181-272183,272190,272193,272197-272198,272209,272217,272223-272224,272243,272245,272247-272248,272250,272252-272256,272258-272259,272263,272270,272273-272274,272280-272281,272284,272288-272291,272294,272296,272300,272305,272308,272315,272323-272326,272328-272331,272333-272334,272343,272347-272349,272355-272356,272358,272377-272378,272384-272385,272387,272389,272393-272395,272398,272401-272406,272408-272411,272414,272416,272422,272441,272443-272445,272449,272458,272469-272471,272474-272475,272479-272481,272483-272485,272487,272490-272492,272502-272507,272509-272512,272519,272523,272527-272528,272533-272534,272536-272538,272550-272555,272562,272566-272567,272569,272571,272573-272574,272578-272579,272583-272584,272595,272597-272599,272601,272605-272606,272613,272649-272650,272655,272658-272659,272666,272668,272670-272671,272678-272679,272683,272701,272706,272708,272710,272713,272717-272718,272720-272721,272729-272735,272737-272744,272746-272751,272756-272757,272761-272763,272765,272769-272772,272777-272784,272786-272789,272796-272797,272799-272801,272805-272807,272809-272810,272812,272814-272815,272822,272830,272833,272836,272838-272839,272841-272842,272844,272848,272884-272886,272890-272891,272893,272897,272901-272903,272905-272911,272914-272915,272917,272931-272932,272935-272939,272943,272947,272949-272950,272952,272958,272962-272963,272974,272976,272978-272980,273003-273006,273008,273010-273012,273015,273017-273026,273029,273034,273038,273040,273045-273048,273050,273053,273060-273064,273066-273068,273072-273073,273075,273087-273091,273093,273096,273107-273108,273112,273114,273121,273123-273124,273127,273129-273132,273135,273143-273144,273146,273158-273160,273163-273164,273168,273178,273181,273186,273204,273209,273212,273214,273216,273218-273219,273235-273236,273247-273248,273252,273256-273259,273261,273263-273264,273267,273273,273279-273285,273287-273288,273293,273298,273328-273330,273332,273337-273338,273342,273352-273353,273356,273359-273360,273370,273375-273378,273381-273382,273389-273391,273393,273395-273397,273402,273405,273407,273410,273423,273434,273445,273448,273452,273455,273457,273459,273464-273468,273470,273482,273486,273488,273498,273507,273514-273517,273520-273530,273533-273540,273543-273544,273546,273548,273551,273561,273566,273569,273572,273574,273577-273579,273583-273585,273587,273590-273593,273598-273599,273602,273606-273607,273610,273613,273615,273619,273627-273628,273635,273640-273641,273644,273647,273653,273666,273683,273687,273690,273693,273701,273703-273704,273706,273708,273710-273711,273718,273727-273728,273730-273731,273733,273737-273740,273744,273747-273749,273760,273766,273768,273770,273772-273774,273779-273780,273782-273788,273791,273793,273796,273799-273800,273803,273809-273810,273813,273816,273820-273822,273834,273837,273848-273857,273861-273863,273866-273867,273871,273873,273876,273896,273902,273904,273911,273913-273914,273917-273918,273920,273922,273926-273929,273932-273938,273942-273943,273945-273952,273962-273967,273969,273973,273985-273986,273988-273989,273991,273995,273999,274016-274017,274020-274021,274023,274031,274033,274036,274038,274040,274045,274049-274055,274057,274061-274063,274065-274068,274072-274081,274083-274084,274088,274090-274092,274095,274100,274116-274117,274119-274121,274123-274124,274142-274144,274146,274154,274159,274163,274172,274188-274189,274192-274193,274203,274205-274206,274209,274215,274218,274223,274226-274228,274230,274248,274251,274253-274254,274267,274270,274276-274278,274286,274294,274303,274308-274310,274316,274322,274325,274328,274330,274333,274337,274343,274347,274351,274364-274365,274370,274376-274379,274383,274398,274402,274407,274409-274416,274418,274434-274435,274437-274438,274442,274454-274456,274458,274460,274462,274465-274467,274473-274475,274477-274478,274483,274487,274489-274490,274495-274496,274501-274502,274523,274532,274537-274538,274545,274549,274555-274556,274559,274571-274582,274587,274592-274593,274595-274605,274607,274618-274619,274621,274626,274628-274629,274636,274638,274641-274644,274670-274671,274673-274674,274681,274703,274709,274722-274724,274737-274738,274741-274742,274744,274750,274756,274766,274784-274786,274789-274792,274795-274797,274804-274806,274816-274822,274839-274840,274843,274845-274847,274851-274854,274856-274859,274878,274898,274900,274918,274922,274924,274926,274931,274933,274936-274937,274940-274941,274954,274960,274962,274965,274967,274976,274988,275003,275009,275011,275032-275033,275035,275045-275046,275058,275060,275071,275098,275101,275109-275110,275112,275118,275120,275123-275124,275140,275162-275163,275170,275199,275205-275209,275256,275260,275264,275298,275321-275322,275328,275330,275335-275337,275347,275358,275365-275366,275368,275376,275378,275380,275386,275393-275394,275399,275401,275403-275405,275412,275415-275416,275418,275420,275435,275446-275447,275452,275455,275458-275459,275461,275473-275475,275477-275478,275481-275483,275503,275510,275512-275513,275515,275519-275524,275530-275531,275539,275552-275554,275557,275560-275564,275568,275575-275576,275579,275581-275582,275584,275588-275589,275593-275595,275599,275605-275606,275612,275615-275620,275622,275624,275633,275636-275639,275645,275660,275665-275666,275680,275683,275686-275687,275692,275698,275709,275721,275727,275729,275733-275740,275743-275746,275748,275752-275753,275755-275756,275759,275779,275781-275782,275790-275791,275800,275805-275806,275808,275811-275812,275816-275817,275820-275821,275833,275838,275842,275846-275847,275850,275852,275864-275867,275870-275871,275897,275906-275908,275918,275920,275922-275923,275925,275930,275941-275944,275946,275949-275953,275958-275963,275965,276003,276007-276008,276012-276013,276016,276019,276026-276027,276029,276037,276045-276047,276049,276052-276053,276063,276065-276066,276069,276071,276079,276087,276098,276101,276123,276127,276141,276145,276161-276162,276165-276166,276168,276174,276187,276190-276194,276196-276198,276200,276202-276204,276206,276212-276213,276218,276221,276226,276228-276229,276238-276240,276247,276249-276250,276296-276299,276303,276306,276309,276313-276314,276318-276323,276333-276336,276340,276344,276346-276347,276350-276351,276359,276377,276392,276394-276397,276402,276404,276407,276412,276417,276419,276426,276430,276444-276446,276462,276469-276470,276472,276483,276489,276491,276495,276508-276509,276511-276512,276517-276519,276521-276523,276525,276532,276534,276550,276564,276570-276571,276574,276577,276589-276590,276596-276598,276607,276611,276626-276627,276630,276632,276638,276642,276644-276645,276654,276666,276671,276681,276695,276703-276704,276714,276717,276724,276728-276729,276749,276751,276758,276765-276766,276775,276795,276798-276799,276801,276803-276806,276808,276814-276815,276820,276822-276823,276825,276827-276828,276831-276832,276835,276839-276840,276842,276844,276847,276861,276863,276867,276879-276880,276891-276893,276901,276904,276906-276907,276913,276948-276949,276952,276959,276981-276983,276985,277023,277025-277028,277032,277037-277038,277042-277044,277047-277048,277050-277051,277055,277085,277096,277099-277100,277102,277126,277128,277135-277136,277147,277158,277169,277172,277175,277177,277179,277185,277199,277202,277206-277208,277211-277212,277216-277217,277236-277237,277239,277245-277247,277258-277259,277265,277270,277272,277274,277278,277295,277301,277305-277307,277318,277321-277322,277328,277333,277340,277346,277349,277351-277352,277354-277355,277357-277358,277365,277372,277385,277390-277391,277396,277417,277419,277433,277453-277454,277458,277460,277463-277467,277469-277481,277487-277488,277512-277516,277523,277527,277529,277532-277533,277536,277541,277555,277568,277579,277594,277606,277608-277609,277642-277643,277646-277647,277649,277655-277656,277659,277663,277666,277674-277678,277685-277687,277693,277709-277710,277712-277714,277717,277725-277728,277730-277734,277736,277738-277741,277743,277758,277792-277796,277799,277802,277806,277811,277814,277827-277828,277834,277836-277839,277841,277854-277855,277862,277868-277869,277877,277883-277895,277898-277899,277901,277903,277907,277917,277922,277936,277939,277944,277948,277951-277953,277958-277959,277969-277970,277972,277989,278000-278001,278004,278010,278016,278031-278032,278034,278037-278038,278053,278061,278070-278071,278074,278098-278099,278101,278103,278105,278111,278114,278118-278119,278135,278145-278148,278151-278152,278159,278161,278172-278173,278182,278192-278193,278202,278204,278206,278209,278212-278213,278220-278222,278228,278248-278251,278254-278255,278257,278268,278282,278292,278297,278300-278303,278311,278313-278315,278321-278323,278325,278327,278335,278337,278342,278348,278354,278362,278364,278371-278372,278379,278402,278438,278466-278467,278469-278470,278472,278474,278476-278477,278483,278485,278488-278491,278493,278500,278502-278503,278521,278523,278526,278530,278532,278551,278584,278586,278594,278598,278600,278603,278605-278607,278619,278621,278623,278625,278627,278655,278658,278672,278681-278682,278697,278704,278706,278728,278739,278751,278760-278761,278790-278791,278794-278795,278802-278803,278827,278833,278835-278841,278844,278848-278850,278856-278857,278865-278866,278870-278871,278888-278889,278891,278905,278915,278924,278933,278937-278942,278963-278964,278970,278976,278983-278984,279016,279037,279046-279048,279050,279076-279078,279080-279081,279083,279089,279092,279094-279098,279117,279123,279141-279147,279172-279183,279186,279197-279198,279205-279206,279209-279210,279219,279223,279229-279231,279233,279241-279246,279249-279251,279253,279257,279261,279266,279268,279270,279275-279278,279281-279284,279297,279301,279307,279310-279312,279318,279320,279324,279326,279336,279346,279351,279361-279362,279364,279366-279367,279375,279390,279393,279395-279396,279398,279400-279401,279411,279531,279534,279544,279559,279563-279564,279570,279573,279584,279587-279591,279598-279600,279624,279642,279651-279652,279654,279657-279658,279673,279675-279676,279684,279691,279695,279700-279701,279706,279720,279722,279725,279730,279735,279757-279758,279764,279776,279779,279802,279842,279854,279862,279864-279865,279869,279875,279892,279894,279896,279903,279910,279913,279919-279920,279927,279929,279931,279935-279936,279941,279949-279952,279957,279959-279960,279963,279965,279967-279969,279975-279977,279979-279980,279987,280004,280017,280026,280037,280040-280042,280044,280090,280125-280126,280133-280134,280154,280160-280164,280166,280172,280177-280180,280183,280187,280191,280195-280196,280206,280208,280210-280211,280222,280230-280232,280236,280238,280249,280253-280254,280262-280264,280279,280286,280293,280297,280299,280301,280307-280308,280322-280323,280325,280336,280342,280345,280347,280357,280360,280374-280380,280382-280385,280387,280393,280403,280429,280431-280435,280463,280475,280597-280598,280640,280685-280688,280700,280702,280716,280721,280756-280758,280760,280763-280765,280767-280768,280780-280781,280786,280797,280807,280814,280816,280818-280819,280822,280830,280834,280840,280846,280850,280861,280864,280866,280870,280879,280881-280882,280884,280893,280914,280919,280923-280926,280928,280931,280933-280939,280949,280959,280974-280976,280980,280988,280998-280999,281002-281003,281005-281006,281009,281026,281053,281070-281071,281081-281082,281084,281094,281107-281108,281112-281113,281116,281120-281121,281136,281146,281159,281162-281163,281166,281171,281176-281182,281199,281206,281209,281216,281225,281254,281271-281272,281275,281309,281311,281320,281324,281331,281335,281354-281356,281358-281362,281380,281383,281387,281391-281404,281406-281411,281440-281441,281451,281462,281470,281475,281483,281495,281500,281502,281529,281537,281540,281544,281548-281550,281558,281562,281582,281591-281592,281605,281616-281617,281626,281628,281666-281667,281670,281696,281698,281700-281701,281703-281704,281712,281738,281745,281756,281762-281763,281765,281768-281769,281775,281777,281780,281782-281783,281795,281809,281825,281832,281840,281857,281860,281875,281881,281883,281918,281923-281924,281944,281962,282041,282084-282085,282109,282112,282116,282119-282122,282125-282128,282130-282131,282148,282205,282212,282215,282245,282247,282266,282300,282419,282434-282435,282469,282680
Merged /projects/building-blocks/sys:r275142-275143,275306-275307,275556,275558,277445,277670,277673

AFAICT mergeinfo should only be modified for stable/10, and only the revision that's being MFC'ed should be added.

I also see such mergeinfo in the svn diff output. I am not sure why it happens and how it could effect the commit. What I did was:

From my 10 stable workspace I typed:

/usr/10stable-src % svn merge -c r282212 svn+ssh://svn.freebsd.org/base/head/sys sys

Then I just generate the arc diff under that same directory:

/usr/10stable-src % arc diff --create

I don't know why all other commits got into the mergeinfo. Is this the right procedure to merge?

In D2574#47664, @whu wrote:

I also see such mergeinfo in the svn diff output. I am not sure why it happens and how it could effect the commit. What I did was:

From my 10 stable workspace I typed:

/usr/10stable-src % svn merge -c r282212 svn+ssh://svn.freebsd.org/base/head/sys sys

I'm not sure you can do it that way, I always have done it from the same svn checkout, as described in https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html. If you are doing it from the same tree:

$ cd stable/10
$ svn merge -c r282212 ^/head/ checkout

Should DTRT.

Thanks Roger! I will re-do the merge and upload a new review.