{"thread":{"id":"386","subject":"Odd decision of git-pasky-0.7 to do a merge","startedAt":"2005-04-29T07:36:16Z","lastAt":"2005-04-29T20:52:50Z","messageCount":6,"participants":["Russell King","Linus Torvalds","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2120","messageId":"20050429083615.A32271@flint.arm.linux.org.uk","threadId":"386","inReplyTo":null,"subject":"Odd decision of git-pasky-0.7 to do a merge","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-29T07:36:16Z","receivedAt":"2005-04-29T07:36:16Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"This is what happened this morning to a tree which only gets pulled\nfrom Linus' tree. No other changes are ever committed to it.\n\nWhy it decided that a merge was necessary is beyond me. Any ideas?\nDid Linus forget to merge his tree properly?\n\nMOTD:\t\nMOTD:\tWelcome to the Linux Kernel Archive.\nMOTD:\t\nMOTD:\tDue to U.S. Exports Regulations, all cryptographic software on this\nMOTD:\tsite is subject to the following legal notice:\nMOTD:\t\nMOTD:\tThis site includes publicly available encryption source code\nMOTD:\twhich, together with object code resulting from the compiling of\nMOTD:\tpublicly available source code, may be exported from the United\nMOTD:\tStates under License Exception \"TSU\" pursuant to 15 C.F.R. Section\nMOTD:\t740.13(e).\nMOTD:\t\nMOTD:\tThis legal notice applies to cryptographic software only.\nMOTD:\tPlease see the Bureau of Industry and Security,\nMOTD:\thttp://www.bis.doc.gov/ for more information about current\nMOTD:\tU.S. regulations.\nMOTD:\t\n\nclient: nothing to do: perhaps you need to specify some filenames or the --recursive option?\n\n\nreceiving file list ... done\n00/10511083fce44618d4e8c522d588a9a983a668\n00/46c219833d6cfbef77e85addc663e1be71e290\n01/e714b511b58e754d425c2e6cf942b501b139de\n04/14eb325468076106ba93369a3b83fbc1fe38f1\n04/7a2428a14216a83980ed26b6a59b3ca40a1fb0\n05/262249b01a4822e9e7ec2ab766ae90b5924cee\n05/61d95240fb019e4be919ce529f23cbb5be6f23\n05/8c70c6f1ac32b5672fea3674dd6950fd03dd62\n06/5558c4234f8a19cf2fcc0d036c919798556412\n07/5d3961a119e8f27294cd77193f8fee7908a521\n07/838a5ba3a1778572a0266335f92a677c347709\n08/5109d2b55e21f31dd368336b40f66d3778bf13\n09/9a58f681ed951434574ec39bdfe87055bafe73\n09/d1db5c6131232f764046160c29118cd4e5e646\n0b/338eca6dc0b1559e2392af2964f5d7fcfe1820\n0c/b766ae629c70d53040f85de73db0583eadb233\n0c/fbd4329546e2892de17eb748a26cbe1fbc2775\n0f/440d7ba256e0319eec350e8fe4f48cccac5866\n0f/7ad450394560a6b6c72115e04bf7afd6230e70\n10/3c63af4e29ee400b0bef59ed5a9d0be65a7a2b\n11/aa0149d0e49ee1791735ec4ae3079b27b9a68e\n11/aaf9d3ebfd4998fc7d550c9af4f502105f0835\n11/dbfcb33b10c6c589b19377f8ed7a9ac61f1526\n12/4fb98b8a1a09d395815daace2db1902855bf68\n12/ba81d7b07f6d1baefc380a43fb24261a583991\n15/3fae07372c65d4291522e42aa5a39135d5b18b\n15/8e8f25b1c05b05aa221ae40483e5061b6b4732\n17/3372162ddbd414cc471c1a3a52ad7ea279aaf4\n17/4114fec801a31e00f5ffaeb7e9b9fc1ca40a40\n17/44196a8cf6bf3edfd7ad63c6a10f1609bd206a\n18/c8baff8fe151ea02e00047afc369ee31939e9b\n18/f0bf2e180d1585d88fee4f47af7c43d7a51399\n19/59c7c4b185b48793ed81aee9d1cd61b50cc070\n19/8d0b03c0afa7974cd6dcea4e711351f4e056eb\n19/9311746932ee3952abebc5d008b8c9daf9c11b\n19/da861e523d8dbbfe327e4b07d166c61544a623\n19/eab8ed1f4482c1603df19d25095a44d2610c62\n1a/2849fe1ee2603a9f8e6c6ccc0d43e73b70e02f\n1a/4db9bc742bcfd7368caf79b9c751f49b4c667b\n1a/8828481234fae6a6858e868f3c0f6058cb4673\n1b/0070dfc51ceacc55cb568d64db7405e950e8d9\n1b/3082d79379d872481aa3b109be42f408cb7c3f\n1b/53dcd0f2ebc3e13f9f30bb3170692009b3cdc7\n1b/5ee6f1b9909861b19b2ae8f932a77eb0331143\n1c/ac5216b3a2b41e313dc90069861663d73d8531\n1d/a0c78b32abe122a959d2a57ba3d41563d8e39f\n1d/f26ddf68b1534f0602f5b8c2bca870814c4ca7\n1e/8490ed694878b3bbed1e96ab792791ddf1daed\n1e/e90350d3ad6c2c3d59fa598c1440fcdf5a34e8\n1f/22b85324cf479f26b890819af1b53858c282ce\n21/a246473a910264fa847e6e472803ff879ee77b\n22/557716f9afb48c032d9c7759706183f01b6a9f\n23/7e3bf94bfe888475053e2aced02b7d140fee8d\n23/c85a236c4197dce7c0681dea1849d8f10871b5\n26/04f6da1afb56fae5930b58349e43a2b0345933\n27/5cde1a1f3880601509c851d72c82bb8d3ee67c\n27/d433fad9b7bda681bc4c0904e95052007aca92\n2b/2eb698450143266af83c36c96f53a3b8a3b8f2\n2c/7fe5e4b7676df9483294bd164664ed202a948b\n2e/1f9c3556f5922a9018c30055949f7a64f333be\n31/0bdee25400f6f3bcbc3d946a885a794a6097c6\n31/ca3bc3c569f9fe02aae6974ac3a9126f14902f\n32/2a12450ad3b0f527d2d05fe27585a14197062d\n32/2c700ba3ea72525b3b24d3107a0eadcfb3f968\n32/f2249411fadabea3767ce3b20ad820f382f401\n33/4f61773e6d692844aab739df7ca0084f54ab1c\n33/ac8bf47b0e0d64b2ba9a75b136bc82eac1fa65\n36/d3c128a58bde9166e94cab813ef3314ea28926\n38/3c9b6e6992bbc2297092c79bf262a3d78b8c8f\n38/3e55fa7d260687930daeb43b1309f58175de33\n39/0f22fa343908003b4241c3d99e7bde2ea84ba6\n39/170cffcad8289a1ca92283aa6435c33b20f0e5\n3b/8a7cf7a9528501b0e3d72ccc8cbd384fd88b3a\n3b/a5f5e71434a3805151f82cf3a50c1201fc254d\n3b/f8a0254f81b64aa4a5429ad7b725699d810b15\n3d/036bf689d8bf986c13824170cca71c0d1ea35e\n3d/5365b9f5ba3791eafe9e8b9c654dffac0d9d30\n3d/61d96d740787e6b56a2709ca905c5a373fb50c\n3d/bbf61f4416fd32ab54f5b7612066201a230f7b\n3e/20876b3b1d6d4fda144c0e13029e5570dd237a\n3e/386fd4c5c6e627699ccd04117b712030f0f3f4\n40/4eac144d1403a60d5aaa07a435df987936cd30\n40/61e43471c1a1dc1822fcae3dca02c4406794f0\n41/2b6d243d539994f903007b7299af797580842e\n41/9f145c80b53f5e84688e68fd35e840b7b4d089\n42/1be78e49566536638effd2fa3f222686cf27fd\n43/37f8e30352d7ee14c33fe758ada91e66b93d80\n43/3dc24f24b409fb130f638aa85470a0eb666206\n43/7be1efe99e2ac4a2047e43f660e94beaff39d3\n43/b3119a16edf5abae4106c36f685c6066163cb2\n43/bdc521e20d9564ccec6472b30d95328e7d1329\n46/1a706b237b3a474af78c4d93661da38a74f2b7\n46/810cbf3d951c1ce8ce3311639996ad43ca4ed1\n47/6b6398ae1e816b7a937f79a827077c8a07b651\n48/c37a6e9c3f9520389b68a1587a1dfbcb566206\n49/1cf960229a066196d1efb3f5687912b8b44fee\n49/c01a01a105271d692fedc49056f91021363075\n4a/33add24d53e0c3238b6efaf189529254c4b2ba\n4c/46d8ccdfb80d31afe11dc64b66bcc698aa7119\n4d/2404305ab687c2a0eee84b3c5842ba9852965a\n4e/b701dfc618491c9b97377df6e61de36dfc39ce\n4e/dda35d03b190cd17a160203dc03ad317da3d03\n4f/53f1bc37e568392bc9250bca411c8b678133bd\n4f/cf343d0bd39cbd233f169bbca59026c80d28f1\n4f/f37981c0fe65da379ec6d9e5b3e789e18669d3\n50/15a6eb19cc62766fba00c3183e21e5ad50ae9b\n52/a66ef24ea412473702a63f261e1520cf8e1885\n53/acb51d98359b351d34b48ecc0dbcfe7b3c982b\n54/b8e3482da23d0265c01a1cbd6e4327e460cc62\n54/f82454cc3b22e0dcb54c8be3b1c5be9eadd6af\n55/fffb67b924fbca2a5a16e83100a5d1000daaf4\n57/337e42f1393941d59d5154eed27a63988ff2be\n59/4ccc14dfe4d61b476491758425a1c2ca4ec71b\n59/8d971c43acfae63d15a0f18e65c154639b3299\n5b/352890f0929e952a544925ecdd59c6436e1504\n5b/ec0039f4ac8d707d7afe7739cc2e7004447e38\n5c/73444b7f1d60b759c223d915fb7645984e5865\n5c/ca3685e4f5153f1e9cd1e896ef64d66222fcbf\n5d/8887f8f749c986ef320a3f4f0d169056791dd7\n5e/6bc34f86e450ff14c4817902d66aa9c786bc06\n5f/132c390eff9766a2d46dbd8fcacc3e5707576a\n5f/365aa9daaf89a9890c53dc681474a7fd292e45\n5f/8488a8f3616b2e85322fb7a07f71604a7dee48\n5f/8d25b40a7d8c95778a024d9883dad271e4062d\n60/3753f5c534a7abaafd93231cefb35c59636165\n63/22aada491f53a45c8680312fca1c55f65ec24f\n63/4d6d1da8876b618060bbe5032d6cddbabcf840\n64/7c40faf379ca38f47c4d13b3528baddc9728ef\n65/40623d747e228ae1b8ca606847c584568a63f4\n65/6dcf2b1a26d714cd71059652e51e8ad8916426\n65/ab9cf2032aa9c262397ae04acf30daa0af26ec\n65/b4b2d1f2cef8d7db8a3c907748e1e959bbf1af\n67/010fbc6ff889aaf86592bc148d705c5b9e1a27\n67/0947288262c099a0f32ecffd3e4ca110ad9eb4\n6a/0b48245a135cd132e747815854e3999967f8a7\n6b/d012e17f832096d507cb0e47ab3c13ffa58ed2\n6c/24d9cd3d66c2849dbcfe544c0739232bb4e690\n6c/91d362f1e1ebbd4513adb68fc79d552c11e2c0\n6d/7098bc350768f59a41090ca248ae430cd95b25\n6d/7bb427e4fae5a3222bb0ef4ce955a86d28d488\n6f/a7c25204d4af62822ebb1e02694744d897b644\n71/1bb7a3a98e09e737c8c90c2e1d72c07af1257d\n72/51e83f83f790140c6d27c442fee90a4b1d5407\n72/fdc10dfdd7c94327ad87efff1dec2adbb67cbd\n73/52e455053cc857e70f0cb1e008eb7adabbe011\n73/5bdadb8025241a514c672537f231c614010c61\n73/7b758c965a9b223ac1243ab38d9e507ac86c64\n73/882e54b4c37169922ad83b62822ce2026ca05b\n75/cf6bdc52d86ca815f1129529e43f0d904b18d5\n75/fd3bd6e233fcee34230f6072379d5f9117b935\n76/23e9fb5cd3dbb14ececd909dd838f5bfb676f7\n76/fdc06010b9b73965893a5bf7bfc30ec2adf2e4\n77/2998147e3ef989988c184520f6dacba9fb601d\n78/a6cc041b24a1c09d4551326db14e0e8e0581ce\n79/944bf71352f33f984ac3973b159b5c2cee139d\n79/bf686a2a190875dcb37a239811659c2e2c95df\n7b/20171f30377b2baf999e5723eb8f75a516852e\n7b/3c63ac7cb5e2e6680727045aa35c2e5f1bace7\n7b/4ac096cd114d34e623bafaed91b85ba4a95e62\n7b/798a53b5306ddf45e969eb03badd6aa10d8064\n7b/84b2bb8c4a85e8e50247ee3a514c6baad8dd7d\n7b/e4a4dc45e83e793f729a69d94b9970d08a2092\n7c/a876b6f2aba485db21483603e0774f4bf7f469\n7d/2a9202c39a3291969307c1c57bdc18237fca57\n7d/80df9364db5bb892b70ee99e82395ac9859f88\n7e/3e0360b711568fb8ba5973accf51d51e746abc\n7e/6b9867ece039ea5dcc66171890f02390b96052\n7f/8df48d633406be25ebadfc94e8dc16a0501224\n7f/c31849312ba85976eb1024161d057b02c672a2\n7f/d02697b12e47852cbbf60e2be51dbbce799514\n81/1e994ac8d41515d3ec3420e234867db660293f\n81/4e709ca0cab6eebcd31cabd5939392423c08b7\n81/babab265e1a31fcad6c97429fadc8d052890fd\n82/235e9170f19fa327361ee82a76618e60f2db47\n82/ae59d7cf9d2551c65bdcbea120eba517c92372\n83/4297f7b5e197cf8bcba37e163c0ea15cef4727\n83/974efa2e0d3f83db0f5eed5abb2128457cd51f\n83/e05457625800d3ec336f4355e49a8c2c368331\n84/8f3fce45d2ba93e10b5e9d65bcae0d9269ad0d\n84/b5b370b09d7b0025152062643284160d80e107\n87/1a5cc574d49a75ead6df5ad8c721f6941788b4\n87/d760fc71fc8fc2c328a8f92d0ded2deef7afec\n89/c8b3a11086a2a43ac4240116da77b707f37fbf\n8a/8aa785e7b7c7a30a39f464b55e05bed78377ae\n8a/dee7996cf8dd7e0cdb94f0efb8837e1eba31e4\n8b/5c596a1ccca947e24eec86840af439721c27bf\n8c/2077ab23c9a76cc631a63ff573afd0571bdcae\n8c/5d310514ea8304f719fe310fe3e236029057b7\n8c/c23e7d0d5d34e69924e7752e3a816dd6297cfc\n8e/01b8f09ac28914573c81727d9e19ab55076652\n8e/567fd0f45d16c4656e7e9a42c7d4749d19ca48\n8e/f414a2ae93a0773a9c8aabe2254c87502d3ed7\n8f/742796a627d46e142ae0eb8ba563857bc74c7c\n8f/c0801f8457222c72ffc82dce4301f094ded654\n90/0121a79544f627e6918783e917f44ee76454dc\n91/3fa9f6202ba7c0039c3a3bb7cc1bfbd2c56e66\n92/81fdc7897f155733567fc229eb38f7cff2c673\n92/9b8ce02fd119502699442cf0178c0b68eef926\n93/08e8acb6522fcec648e09aa77ddc3a6a694fcb\n93/900fc4adaa7a9f426d68b78360fae5a94b45ee\n93/91321485e530375cb5ce1fced0ece2acc02a67\n95/bd6eb828035af5e788ed8ba4a11b9b004eb85e\n96/6ca9234754ece58870075972ef103e354de075\n99/a096d3f84d679d668807d5081baf4beeabc95f\n9a/41bee11c5a58621e990e539361e2d1e9975ac6\n9a/cf6597c533f3d5c991f730c6a1be296679018e\n9b/4b4abb85b045fbf95700c1a9ca6e6ed7dfd60b\n9c/7755053099534e865fa3c179f525237fc9945d\n9d/cdaf3b573a2a27d0d43c1477a18867b144e5f4\na0/08f82439538b89bd8dcd34a40166d857a297dd\na1/c818b0347170e47aac074cb02d74d016c1caeb\na4/593f83188c646e0f5350102ef3ef2a71e4b476\na4/f1c34a8dc7fa518e557f8f57beab4c1a4ee3a5\na5/271dd6144a683554f85e311e67c15000022646\na6/1a577f0f2b2fa55652b137d96cbddfa8c665cc\na6/9227415a73d9a771ada4d617802d3ecf0bcf56\na6/e66974b2863135d298232cfb2973a7a9721658\na8/d592bc33fe25c8bef37ff9d16353a30fa26aa7\na9/2af41d44119a2c464f3b905b181f4445c9f1db\na9/e4f989b7f744439989125e453017a7f323fa5b\naa/b62ed4698223d915e5621339b30396d9c38eea\nac/1f970e5369749c8aaffbf52095d0bba7f374a5\nad/009ac96509e005d9978d0ae9e9ec4d63ad2990\nae/48ef0429774c406307909e72db1238b5f3af43\nae/de6a81316794a1a20de497c9684f96e20f6f0c\naf/014fda7701d3e844a3c5791b0c782d01d37eeb\nb0/04fef0a42bac42e8b3490fba19df1ea233762d\nb0/67113d0f0f4dcf0e11cca228b50e275679e0d6\nb0/8d4fbdf4cb46820898b71a1e55139c676c1b1f\nb0/ea6687ab55e8116a4790a52682e24c71146c34\nb1/02ddb977ca0352fb2c1b3bc94f40b72204c56a\nb2/99a2ead3f966dff04343a7b53bfd07e6b986b4\nb3/03c4998c1c66d271165a6b6a4c49ef0092eab4\nb4/86ba738d955db6acdb074e089831b9c6109b43\nb4/9f31ebecda19d071d3ae3777be2a6a8c9e5c34\nb5/99e682e12af8dd9d15d295bbb2d29f064a2904\nb5/a5278ab6c4cfaa35f41662b2c8d0fcaf0555ca\nb7/63f4acf57f69b51d00a3a62ad30cb91b02baba\nb8/4faf8d07d46d0a4604140264365a271a97cee5\nb8/643e1b5253a6a51da5574a55a2f9148e255cfd\nb8/6a48f6a44cd924684aa5efc55b2760e2365f78\nb9/b9e10f180fa63b55b93412edf0ab9648675646\nbb/bde0ef164c9e08491ac57846354ef8f14f70ad\nbd/3b55e1be179c671cbdb94060bb580def15d113\nbd/e0fabfece0aeeaecd9ab4b1c2cf733009975b1\nbe/3a57509e60e8dd6aee31fcd5b409a7fd104c15\nbe/c7b3fc8a721c5a84e24b22ae8db9ca2c535cfc\nbf/f2ec6e054adbc83c37c4befe9c22d8d68cc919\nbf/f893e2aa5c3644133d680b24af9940c5b2189d\nc1/e02eff1d25a222613f48b5312cb055776abc00\nc4/d12b98ead8bb2437f656c17e7ef065fa160e13\nc5/8c850264587902314b46d6f2e511ba784f9379\nc5/a3642f18f171b57c1154ec25fafdfd14d99502\nc6/0c390620e0abb60d4ae8c43583714bda27763f\nc6/2be999df17e02a94cba833885174daab8e7a5f\nc6/4f3c478297b38361f91fea0609fb4fbedaffaf\nc6/7593a03129967eae8939c4899767182eb6d6cd\nc6/95b98cd83e7a80e14db529c67f8a90f102e290\nc8/1156dd217818c143a09b6a744e797a04571e99\nc8/d89b33813151793660c6bac60d3e67b0e573f3\nc9/99583d11b09a94481bb67508a708fd5bc353fd\nc9/ae0503631e4c0851499af9a3e28508c1d4ac4f\nc9/d9ea064734ad58e18c14e03055816b0c219dd7\nca/88216b053d73a571db992fecc3f2709dfe5dda\ncb/e0476fa6a76b01b79e7c117963d45ed0a28758\ncd/41c67ff8d3b6a4aa75012b38fbbcfe28dc67bb\ncd/63499cbe37e53e6cc084c8a35d911a4613c797\nce/16b0ae772ef6db31cad1930a259236e1629448\nce/4cf5c1c05d7affced4678fea31b1fcdf68822d\nce/9423bb2de319d095a3ac5d8e762dcd6d8b3913\ncf/72cd46896e32aa3c579a15119f425fa20ea059\nd0/0b3bfe1a5213830c6aec6c39f56d0910be390a\nd0/724714fd49aeec1383b94807174de7e96021bf\nd1/4537f103bf746ca766f739f9f5a5bf7a8b4806\nd2/b6d5727cd0c5c945c600d9099c6ff543e33afd\nd3/2dddbd699516a02d197eb9df0bef775082ffcd\nd3/fa896c5b32f370a8019b32391edff25638704b\nd4/335c1c884c7ae9384be6003e808cd91bdff918\nd5/d49b584db48329e89c48c6c542b1d20d897e0e\nd6/ad33e52ea955d714dca140269a1b43abef1473\nd7/6f309be63c401be4647e05428a96d5d2daf5fe\nd8/37c51bd6e522be497a94b9a335bf65aaa6532a\nd8/c1630a530a825d27e517c78e894bf565255a6d\nd9/668d210a2b9bb78e3a8bb71cec272a7773d4ef\ndb/14b503d89e596dfa2c4102fca9469a7e814ce2\ndd/3c2338700b787accbe2eacf77ecbfd82996ad9\ndd/54716d7f77c2c35cc698208e79e5797ee0f9d4\ndd/95c2bcbc25b869f0f059842fa5391d4fb1a1f5\ndd/e2d251fc3d6b0d387559bf5c590ede89bcf80a\nde/63a0e3f4ce3960f1f6564f73f496533d4cdc24\nde/8858028d64a8a3d3fbbb7bbd7b138d7897d356\ndf/aabc8d8fb6ad8caedc34c5a30f4eec3555a0cc\ne0/e46f4bff970554c924404cec04d007b8d073a1\ne2/e5a870dd0b95c54d1b01a318b1a119181309e2\ne3/137aa48cdd6a4f4dbc5df53f03deab774f84ee\ne3/503e7a58208b635f444880ce44fd996c5e7ebe\ne3/b177a90b37838c6d9c98461ce2446091e646ec\ne3/e92615705e96211ff6b70978516151badaa90e\ne4/5a78777f977ba4670e7419bfdcde8a1429ceee\ne4/b4b0f5eb3338e043eb3b7a78c16eb162f62e72\ne4/eb295d38b57f4d4b956942a48887eb252d97c6\ne5/0249ae3d227c320d8ca2fbb03b2258b04c7c95\ne5/68cc47a7f93005518d1470696f89ee1444a1ae\ne7/1f64f2f4c33c9e343d121fcbeff7b660961382\ne7/bd93e6226d58d9fcb9501671ab8ca2bf7b0820\ne8/b6981ac7b6aa63b025dda4800407136a1b7865\ne9/a6cf21a3281605f290b754404c748fe328e560\ne9/bb29c86d6e7554427e601a93e523c5bdde01bf\ne9/f832c9ea690e067a86ab23ea5f245a1d201b1d\nea/3f4eaca09de1bcc80e922e56a6dabba5882f56\nea/67562c18336e7ae5c61e3492f1909b987d00dd\neb/134af00ca96e45460e2b835616673902a09cda\neb/15ee8333fd7b5816f8fe3d02250ff99601eba0\nec/00d61d53080b1b5e771ba3b0d0d2a83ce6e30a\nee/86cb8216e6dd9f0400e54a39718448c9566a41\nef/a099165b22ea5d52a2d8c454cbbaf201596083\nf0/10f523dc053a249859b9862803bb24ecc6e2d8\nf0/5e4cf6bcb6ce8e0aed29e6670c0fbfa1e33192\nf2/8ac91b0541a49d5bc7bfb9f0efd5289a7dd181\nf2/a026073b62b683cd1ca4facf40c7f338b2e7a8\nf2/e75ed4c6c757caca14fa19cb488e75d97f685e\nf2/e86a794765410c29d089b514a7afb6d0dad38e\nf4/845b6023750b8276053916750bd5a2ff29e4af\nf4/d0ee983ec01e59a77e157ab702246f397b2a2b\nf4/dc76916955edbdff326bcbefd7be2686d1ef1a\nf4/fcee104707ae7961605b632aba1bf620c25603\nf6/54bac2227adc5c6956405290eeb4f81f09e9ff\nf7/c076d76280f292d76344eaefb3250b80c57697\nf7/c4914c3dd98ba6da3a10bb117e63fecfb5ad60\nf8/edf816b4bed1de6a253cb45a553caea1af8276\nf9/2c6c1ddc6c70c54dc9fa93a1c56edef67563c4\nf9/e16b39898c5f137327094d2efaf873c249d46d\nfb/835c7bb8ce592803c6285806ac7c3fa9ecf16e\nfd/717aa63e7bd485937e080c0764e3f3f6f0a532\nfe/14097995135d35279d8e6c7e92f9b2a90cca55\nfe/abea16b92f378a66388eedb82d07ab89a90143\nff/84d433f8d1291559a76e79bab44239b8d9f3e1\nff/8b49966a9f6ed23f6489bb986de87a14d4b783\nff/df28ddd4d7888ec532a26c7c1f81e061c4eff0\n\nsent 6894 bytes received 2681866 bytes 43020.16 bytes/sec\ntotal size is 70076313 speedup is 26.06\n\nreceiving file list ... done\nclient: nothing to do: perhaps you need to specify some filenames or the --recursive option?\nTree change: bdceb6a0162274934386f19f3ea5a9d44feb0b20:c60c390620e0abb60d4ae8c43583714bda27763f\n*100644->100644\tblob\tfa4b4dd4a9ff00958b4dd2555d97e42c596878b6->f2e75ed4c6c757caca14fa19cb488e75d97f685e\tarch/x86_64/ia32/vsyscall.lds\n*100644->100644\tblob\t903d0ced7ddb95eb4168775ff5a28ed14f210b98->058c70c6f1ac32b5672fea3674dd6950fd03dd62\tdrivers/net/tg3.c\n*100644->100644\tblob\tacdba0c67fb8c6102bb613b400ae9822964ca2df->3e386fd4c5c6e627699ccd04117b712030f0f3f4\tdrivers/video/amba-clcd.c\n*100644->100644\tblob\t6ae62cbf7c2e5ccd083aaea4648c47a04acb9059->ce9423bb2de319d095a3ac5d8e762dcd6d8b3913\tfs/binfmt_elf.c\n*100644->100644\tblob\tacce36e25d2eecaec84eb5aa0d7f0c608a30bc33->72fdc10dfdd7c94327ad87efff1dec2adbb67cbd\tfs/cifs/AUTHORS\n*100644->100644\tblob\t5316c8dd6bfff87d97c8105b0b4639cd2d44194a->4d2404305ab687c2a0eee84b3c5842ba9852965a\tfs/cifs/CHANGES\n*100644->100644\tblob\t0f20edc935b5d9b87e3d08c91ada0846e237e9da->7b4ac096cd114d34e623bafaed91b85ba4a95e62\tfs/cifs/README\n*100644->100644\tblob\tf4e3e1f67ee41afd911df3fcfb8a374881fb3c63->1e8490ed694878b3bbed1e96ab792791ddf1daed\tfs/cifs/TODO\n*100644->100644\tblob\tdb28b561cd4b54b0723e582ce81daba56f3ccb73->4061e43471c1a1dc1822fcae3dca02c4406794f0\tfs/cifs/cifs_debug.c\n*100644->100644\tblob\t77da902d8f32975c0773e8010147849ac9a04364->ec00d61d53080b1b5e771ba3b0d0d2a83ce6e30a\tfs/cifs/cifs_fs_sb.h\n*100644->100644\tblob\ta17adf4cb9babbfbcab8d7eab4eeddd89a079755->99a096d3f84d679d668807d5081baf4beeabc95f\tfs/cifs/cifs_unicode.c\n*100644->100644\tblob\t78829e7d8cd0187b327a8b051019848258754259->1959c7c4b185b48793ed81aee9d1cd61b50cc070\tfs/cifs/cifsencrypt.c\n*100644->100644\tblob\t5082fce3c566d56d81d3b7cbcf447807437ddd2f->8cc23e7d0d5d34e69924e7752e3a816dd6297cfc\tfs/cifs/cifsfs.c\n*100644->100644\tblob\t451f18af320696e8b1b168489ec1441e6a33420e->d00b3bfe1a5213830c6aec6c39f56d0910be390a\tfs/cifs/cifsfs.h\n*100644->100644\tblob\t69aff1a7da9b3d1396dc430478afe75c0d19be50->81babab265e1a31fcad6c97429fadc8d052890fd\tfs/cifs/cifsglob.h\n*100644->100644\tblob\tbcd4a6136f08a879b0f46cda8f10e3286fdf4a6a->aede6a81316794a1a20de497c9684f96e20f6f0c\tfs/cifs/cifspdu.h\n*100644->100644\tblob\t787eef4d86d379a56fd57e48ea51a78fc5bf69f3->0010511083fce44618d4e8c522d588a9a983a668\tfs/cifs/cifsproto.h\n*100644->100644\tblob\tdf6a619a682132f4fc204933b60b85940afcd694->b004fef0a42bac42e8b3490fba19df1ea233762d\tfs/cifs/cifssmb.c\n*100644->100644\tblob\t40470b9d5477a144331f10f12bd5bd7c2c7065be->e568cc47a7f93005518d1470696f89ee1444a1ae\tfs/cifs/connect.c\n*100644->100644\tblob\tf54e1866f0f4407ecda76e810ec953f2209d16a0->e3137aa48cdd6a4f4dbc5df53f03deab774f84ee\tfs/cifs/dir.c\n*100644->100644\tblob\t9d24c40f1967ad6ec5aad6e79d88db69deda93d2->7d2a9202c39a3291969307c1c57bdc18237fca57\tfs/cifs/fcntl.c\n*100644->100644\tblob\tdcab7cf1b53bf16de9c151bfaa651535b4e4f179->dde2d251fc3d6b0d387559bf5c590ede89bcf80a\tfs/cifs/file.c\n*100644->100644\tblob\td73b0aa86775e6ca4c73f33ce8c1bd47433e2e03->670947288262c099a0f32ecffd3e4ca110ad9eb4\tfs/cifs/inode.c\n*100644->100644\tblob\tb4b8e201d428de1b271e090c50f39cfb8d7ea568->b0ea6687ab55e8116a4790a52682e24c71146c34\tfs/cifs/ioctl.c\n*100644->100644\tblob\t1455810ba1cbba4b6fdc0ddd95eb2cc67542382a->bde0fabfece0aeeaecd9ab4b1c2cf733009975b1\tfs/cifs/link.c\n*100644->100644\tblob\t7b38d3059a83d6e916e75f66a7a860aba094b438->db14b503d89e596dfa2c4102fca9469a7e814ce2\tfs/cifs/misc.c\n*100644->100644\tblob\t4e34c89cec5dc8e5c975edd10f420161c37652b8->a92af41d44119a2c464f3b905b181f4445c9f1db\tfs/cifs/netmisc.c\n*100644->100644\tblob\tf8bea395ec9e28aee2f81ed5f0461bc53ee3dc0f->22557716f9afb48c032d9c7759706183f01b6a9f\tfs/cifs/readdir.c\n*100644->100644\tblob\te21f1384661f3e4e6fc42c574cdb047c8689a066->cd41c67ff8d3b6a4aa75012b38fbbcfe28dc67bb\tfs/cifs/smberr.h\n*100644->100644\tblob\taf13e526b150ce3bf052eda83578bbb906f06d55->0046c219833d6cfbef77e85addc663e1be71e290\tfs/cifs/transport.c\n*100644->100644\tblob\t549afa184fd67f852e3e55319af42731ced1b9b9->c1e02eff1d25a222613f48b5312cb055776abc00\tfs/cifs/xattr.c\n*100644->100644\tblob\t2149be7c7023702e7b0dca0bf19b30ed1081ec34->ce4cf5c1c05d7affced4678fea31b1fcdf68822d\tinclude/asm-arm/hardware/amba_clcd.h\n*100644->100644\tblob\t4983449ff2c7fdf98708ea101fb26441f6393982->19da861e523d8dbbfe327e4b07d166c61544a623\tinclude/asm-arm/hardware/clock.h\n*100644->100644\tblob\t358d52b0c445578bbbe1df9c2787e0a0e3250e29->772998147e3ef989988c184520f6dacba9fb601d\tinclude/linux/sysctl.h\n*100644->100644\tblob\t87496e3aa3302a4e8dc42f5c4f53a22f550d5008->7352e455053cc857e70f0cb1e008eb7adabbe011\tinclude/net/pkt_sched.h\n*100644->100644\tblob\t5576db56324dd88ed87f6355a603464532dd0190->f4fcee104707ae7961605b632aba1bf620c25603\tinclude/net/sctp/sm.h\n*100644->100644\tblob\t7e64cf6bda1ef739a64b15a670708c33bbdc4cfd->6c24d9cd3d66c2849dbcfe544c0739232bb4e690\tinclude/net/sctp/structs.h\n*100644->100644\tblob\t96fd0f499631d1036d27b1589c47f1b4c66bc27e->d4335c1c884c7ae9384be6003e808cd91bdff918\tkernel/time.c\n*100644->100644\tblob\t0a2f67bbef2ec0862821c55e70c2625e229c8f18->43bdc521e20d9564ccec6472b30d95328e7d1329\tnet/core/neighbour.c\n*100644->100644\tblob\tbb90a0c3a91eb52020d0db0e8b4f94d30e02d596->199311746932ee3952abebc5d008b8c9daf9c11b\tnet/ipv4/route.c\n*100644->100644\tblob\t183802902c023eb0fed16e3623097edf17211dd4->3bf8a0254f81b64aa4a5429ad7b725699d810b15\tnet/ipv6/route.c\n*100644->100644\tblob\t544b75077dbdd62bdbf2dd15ca244a00fe634a88->334f61773e6d692844aab739df7ca0084f54ab1c\tnet/sctp/endpointola.c\n*100644->100644\tblob\te42c74e3ec1e8f9334ecb451599467d3531da57e->c9d9ea064734ad58e18c14e03055816b0c219dd7\tnet/sctp/ipv6.c\n*100644->100644\tblob\t9013f64f5219760917af8337e390f81323102b34->84b5b370b09d7b0025152062643284160d80e107\tnet/sctp/output.c\n*100644->100644\tblob\tb9813cf3d91c6ea8a99fa3e63f8f19636eae8e14->2e1f9c3556f5922a9018c30055949f7a64f333be\tnet/sctp/protocol.c\n*100644->100644\tblob\t1db12cc18cf7fc4fd0b7209d3e5b03e192df2944->33ac8bf47b0e0d64b2ba9a75b136bc82eac1fa65\tnet/sctp/sm_make_chunk.c\n*100644->100644\tblob\t278c56a2d0765086f540c66d64ff151eaba9a155->8e01b8f09ac28914573c81727d9e19ab55076652\tnet/sctp/sm_statefuns.c\n*100644->100644\tblob\te8c2101825710512f0f7393ecb482835a8664a34->0b338eca6dc0b1559e2392af2964f5d7fcfe1820\tnet/sctp/socket.c\n*100644->100644\tblob\t89fa20c73a5cc244fe8199101452bc606ca26b1c->7fc31849312ba85976eb1024161d057b02c672a2\tnet/sctp/sysctl.c\nTracked branch, applying changes...\nMerging e8108c98dd6d65613fa0ec9d2300f89c48d554bf -> c60c390620e0abb60d4ae8c43583714bda27763f\n\tto bdceb6a0162274934386f19f3ea5a9d44feb0b20...\n\nEnter commit message, terminated by ctrl-D on a separate line:\nMerge with c60c390620e0abb60d4ae8c43583714bda27763f\n\nCommitted as 7598082671ce811737eca8119968dc056d78ac4b.\n\nHere's that commit:\n\ncommit 7598082671ce811737eca8119968dc056d78ac4b\ntree f63e2ded3ec39f348ac7c5e03d51da4ed1ff0eeb\nparent bdceb6a0162274934386f19f3ea5a9d44feb0b20\nparent c60c390620e0abb60d4ae8c43583714bda27763f\nauthor Source Fri, 29 Apr 2005 07:03:57 +0100\ncommitter Source Fri, 29 Apr 2005 07:03:57 +0100\n\n Merge with c60c390620e0abb60d4ae8c43583714bda27763f\n\n\nand the two parents:\n\ncommit bdceb6a0162274934386f19f3ea5a9d44feb0b20\ntree 326774cd0818e893561a3e77fc57ad5ea320771a\nparent 5fc3e624ad7278604628c598e92aa77c67064166\nauthor Benjamin Herrenschmidt Wed, 27 Apr 2005 18:04:45 -0700\ncommitter Linus Torvalds Wed, 27 Apr 2005 18:04:45 -0700\n\n [PATCH] ppc64: Fix return value of some vDSO calls\n\n The ppc vDSO would not properly clear the return value for some calls,\n which will be a problem when interfacing those calls with glibc. This\n should be fixed before 2.6.12 is released (as it is the first kernel\n with the ppc vDSO) so that we don't have to play with symbol versioning\n and ugly workarounds.\n\n Signed-off-by: Benjamin Herrenschmidt \n Signed-off-by: Linus Torvalds \n\ncommit c60c390620e0abb60d4ae8c43583714bda27763f\ntree 11aaf9d3ebfd4998fc7d550c9af4f502105f0835\nparent 0cb766ae629c70d53040f85de73db0583eadb233\nauthor Roland McGrath Thu, 28 Apr 2005 22:47:29 -0700\ncommitter Linus Torvalds Thu, 28 Apr 2005 22:47:29 -0700\n\n [PATCH] x86_64: fix PT_NOTE addition to IA32 vDSO\n\n The addition of the PT_NOTE didn't take in the x86_64 version of the i386\n vDSO, because I forgot the linker script bit in that copy.\n\n Signed-off-by: Roland McGrath \n Signed-off-by: Linus Torvalds \n\n\n-- \nRussell King\n\n\n"},{"id":"2123","messageId":"20050429100717.A5035@flint.arm.linux.org.uk","threadId":"386","inReplyTo":"20050429083615.A32271@flint.arm.linux.org.uk","subject":"Re: Odd decision of git-pasky-0.7 to do a merge","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-29T09:07:17Z","receivedAt":"2005-04-29T09:07:17Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Fri, Apr 29, 2005 at 08:36:16AM +0100, Russell King wrote:\n> This is what happened this morning to a tree which only gets pulled\n> from Linus' tree. No other changes are ever committed to it.\n> \n> Why it decided that a merge was necessary is beyond me. Any ideas?\n> Did Linus forget to merge his tree properly?\n\nOk, there's something weird going on here. On hera:\n\nrmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ SHA1_FILE_DIRECTORY=./objects fsck-cache\nexpect dangling commits - potential heads - due to lack of head information\ndangling commit c60c390620e0abb60d4ae8c43583714bda27763f\nrmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ md5sum objects/03/97236d43e48e821cce5bbe6a80a1a56bb7cc3a\nfd1369dbbd494b1839ad3d633a5d088e objects/03/97236d43e48e821cce5bbe6a80a1a56bb7cc3a\nrmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ md5sum objects/9e/734775f7c22d2f89943ad6c745571f1930105f\nb3b788308b7f137231652b5e97cb08c0 objects/9e/734775f7c22d2f89943ad6c745571f1930105f\n\nIn my repository:\n\n$ fsck-cache\nbad sha1 file: .git/objects/03/97236d43e48e821cce5bbe6a80a1a56bb7cc3a\nroot 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2\nbad sha1 file: .git/objects/9e/734775f7c22d2f89943ad6c745571f1930105f\nexpect dangling commits - potential heads - due to lack of head information\ndangling commit 7598082671ce811737eca8119968dc056d78ac4b\n$ md5sum objects/03/97236d43e48e821cce5bbe6a80a1a56bb7cc3a\nfd1369dbbd494b1839ad3d633a5d088e objects/03/97236d43e48e821cce5bbe6a80a1a56bb7cc3a\n$ md5sum objects/9e/734775f7c22d2f89943ad6c745571f1930105f\nb3b788308b7f137231652b5e97cb08c0 objects/9e/734775f7c22d2f89943ad6c745571f1930105f\n\nThese two objects appear to be tags according to cat-file -t on hera,\nso these probably aren't the cause - it's more likely that git-pasky-0.7\ndoesn't know how to handle these objects.\n\n\n> Tracked branch, applying changes...\n> Merging e8108c98dd6d65613fa0ec9d2300f89c48d554bf -> c60c390620e0abb60d4ae8c43583714bda27763f\n> \tto bdceb6a0162274934386f19f3ea5a9d44feb0b20...\n\nOk. So.\n\nrmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ SHA1_FILE_DIRECTORY=./objects merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20\nbdceb6a0162274934386f19f3ea5a9d44feb0b20\n\n$ merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20\ne8108c98dd6d65613fa0ec9d2300f89c48d554bf\n\nHmm. At this point, I think we need something which graphically\nshows the layout of the commit tree to work out what's going on,\nand why my merge-base picked that particular commit id.\n\nHowever, at this point, I think I can say that git obviously isn't\nworking as designed for me.\n\n-- \nRussell King\n\n"},{"id":"2124","messageId":"20050429103059.A3260@flint.arm.linux.org.uk","threadId":"386","inReplyTo":"20050429100717.A5035@flint.arm.linux.org.uk","subject":"Re: Odd decision of git-pasky-0.7 to do a merge","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-29T09:31:00Z","receivedAt":"2005-04-29T09:31:00Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Fri, Apr 29, 2005 at 10:07:17AM +0100, Russell King wrote:\n> rmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ SHA1_FILE_DIRECTORY=./objects merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20\n> bdceb6a0162274934386f19f3ea5a9d44feb0b20\n> \n> $ merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20\n> e8108c98dd6d65613fa0ec9d2300f89c48d554bf\n\nThis is the problem. It seems that merge-base in git-pasky-0.7\ndoesn't work correctly.\n\n-- \nRussell King\n\n"},{"id":"2147","messageId":"Pine.LNX.4.58.0504291043060.18901@ppc970.osdl.org","threadId":"386","inReplyTo":"20050429083615.A32271@flint.arm.linux.org.uk","subject":"Re: Odd decision of git-pasky-0.7 to do a merge","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-04-29T17:44:29Z","receivedAt":"2005-04-29T17:44:29Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 29 Apr 2005, Russell King wrote:\n> \n> Why it decided that a merge was necessary is beyond me. Any ideas?\n> Did Linus forget to merge his tree properly?\n\nIt looks like it was unable to find the right common ancestor.\n\nIf you only had my stuff in it, the common ancestor _should_ have been the \nparent (c60c390620e0abb60d4ae8c43583714bda27763f), which _should_ have \nbeen your old top.\n\nBut maybe merge-base didn't work right?\n\n\t\tLinus\n"},{"id":"2151","messageId":"20050429182140.GA14202@pasky.ji.cz","threadId":"386","inReplyTo":"20050429103059.A3260@flint.arm.linux.org.uk","subject":"Re: Odd decision of git-pasky-0.7 to do a merge","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-29T18:21:40Z","receivedAt":"2005-04-29T18:21:40Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Apr 29, 2005 at 11:31:00AM CEST, I got a letter\nwhere Russell King told me that...\n> On Fri, Apr 29, 2005 at 10:07:17AM +0100, Russell King wrote:\n> > rmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ SHA1_FILE_DIRECTORY=./objects merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20\n> > bdceb6a0162274934386f19f3ea5a9d44feb0b20\n> > \n> > $ merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20\n> > e8108c98dd6d65613fa0ec9d2300f89c48d554bf\n> \n> This is the problem. It seems that merge-base in git-pasky-0.7\n> doesn't work correctly.\n\nI'm not sure if the merge-base in git-pasky-0.7 isn't the old one yet.\nWe replaced it with a date-based one since the old one *was* giving bad\nresults.\n\nSo, what about cogito-0.8?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"2187","messageId":"20050429215250.E30010@flint.arm.linux.org.uk","threadId":"386","inReplyTo":"Pine.LNX.4.58.0504291043060.18901@ppc970.osdl.org","subject":"Re: Odd decision of git-pasky-0.7 to do a merge","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-04-29T20:52:50Z","receivedAt":"2005-04-29T20:52:50Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Fri, Apr 29, 2005 at 10:44:29AM -0700, Linus Torvalds wrote:\n> On Fri, 29 Apr 2005, Russell King wrote:\n> > Why it decided that a merge was necessary is beyond me. Any ideas?\n> > Did Linus forget to merge his tree properly?\n> \n> It looks like it was unable to find the right common ancestor.\n> \n> If you only had my stuff in it, the common ancestor _should_ have been the \n> parent (c60c390620e0abb60d4ae8c43583714bda27763f), which _should_ have \n> been your old top.\n> \n> But maybe merge-base didn't work right?\n\nYup - pasky-0.7 came out with some weird commit-id, but cogito-0.8\ngot it right. Now using cogito-0.8 here, so I'm no longer concerned\nabout this particular problem.\n\n-- \nRussell King\n\n"}]}