{"thread":{"id":"413","subject":"Todays update (with cogito 0.8)","startedAt":"2005-05-01T08:27:43Z","lastAt":"2005-05-01T21:40:25Z","messageCount":2,"participants":["Russell King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2280","messageId":"20050501092743.B7459@flint.arm.linux.org.uk","threadId":"413","inReplyTo":null,"subject":"Todays update (with cogito 0.8)","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-05-01T08:27:43Z","receivedAt":"2005-05-01T08:27:43Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"This still doesn't seem to be working properly (details below):\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\nreceiving file list ... done\n.git/refs/heads/origin\n\nsent 142 bytes  received 857 bytes  399.60 bytes/sec\ntotal size is 41  speedup is 0.04\n\nreceiving file list ... done\n00/83f2ab03ca2ec99ef2d31104710cf3898ce065\n04/783ceb050c13d7a475a60bdb916b6eb56ffddf\n06/6744ef2b6f86d258c40b00ad6390060d4b4288\n07/a8f51940fb0ee87721628b0e84dd48b293d9a0\n12/be8c2f4969d94e724aecaee7681a99ed4ba41d\n12/f1b1dca9d98e3aaed6e9d8e5db123da16d6e9e\n13/59cf3d21c56aa884c704656c16c0df87c3e6cb\n17/47e1bfd5a700bc4242981c82ac35afcf834124\n18/a6f4b9824853e4afb4f42410eb855f6b188fa1\n1a/844ca139e0df85e57cee2a67916aa305b1ffcb\n1a/b353e235955eee63e43a3a030d0b8b4b719a2b\n1d/651f3332340c232ff66b7f5bab66cb8903859f\n1d/db8a16aa0e60e7fdc48b1f532cf43e692f8fae\n1f/dbe77e8211508763d1e0e9c5fec7065fc1c599\n24/c3666b0f36f9e99c6d91a3266032285781cae6\n28/96a380d4ea902d88f3831d23e847f63ffcf7c3\n2c/acb3da620a4a93f3a77e1d2c8c06bb3c74bcb0\n2f/e7cf50bb45a3ca94f095695bab5414fa56c1f3\n31/eba8fc14bad5baac157b6f9a1123d02e6e89ce\n32/1dbe91dc14e270450216cf4cc79562d89ca225\n33/d8b5800cfaa3d75fd738c3c39411d27e6f9086\n36/d362b6f5522e59e663031f4ce2eaf6169b38c3\n37/0dfe77589d2abd9d8a963772fc79072feba5c0\n3b/948e8c27513f7896263a87a99123ad5394b860\n3c/2fa5c284c04ef223c468c2df53f6c7676dc20a\n41/4f0ffac3493a9c34ded9c137ce8dfdda83ae7e\n47/74e2260cf25c54f2188dd0407676e3af6f1f23\n48/990899db0d9a9506e72fe2fa79570c3b5a306b\n49/e7dc54cd4cbdb439ecc4e06214b0ca1a1a72b4\n4f/a27a868f60eabcffec9971c03cdb7b12629ca6\n53/8f078cc9db35255c8224d3bd39292357c7d998\n68/575476718ed1c6d6ddafeec8310b109e7a7a7f\n6f/2a6107859521b5f6b498aa50421cf0d0aebb7a\n72/b03f201eb946f97c9f419090d683ece6ea5bc1\n74/0fd350c127e12a902e7d781250429c30282bd7\n74/1ff0c69f37f44154247020649b4104afff0cda\n75/22285ae23e8375d91e3ef1e1a8a38acc6707d0\n77/11c1cb3bfa0ef6ba82a20b3af86a490e844131\n7a/76d85912492f50504ba428f4e1c9bdd3725c37\n86/43112fac20933b0abcb5ccb5ea4fb3206962f2\n8c/c881694e2911d0a2eff3ca7eb5dd5efc0503d3\n90/ab8bb6a1d7dcced48f3d079dd455dd66cfdfc0\n93/9c6303e46bbb5f763d51ad43768a4379ef46d0\n95/483baab706baa9921eb14757c08da90970fdb5\n95/c744856cbe042190fe5a346f4f99fd8d655931\n97/47dd6fa98f2983f4dd09cd6dad1fa3d2a4c5f2\n99/c47c498867ff5ee2fe0845622f4d1c4e1df1f4\n9d/31aaad024e5e56d0ee124ea5909e1513e351c7\n9e/a1f8f505f6f770bd593e689960ac4f893509b2\n9e/b5099b4517719370a7655b825dc78ff0051d56\na3/183c173e2fbd44f4cc23da7a18bb283b00c64f\na3/89c37a97b58a3c31d19b2ab9665bb96196972e\na4/5aaa115a76664bb81438455b06a6ff890886f7\nb3/d9ae4b98f6d28481d4d4b768d860a2cfb5805d\nb5/9438bc23460062417fe1d5e3aa16679cde91bb\nb5/fd078b5a6deada354ca78f0e6334c718ad6989\nb6/d8654a4f75e8eeba365d4fa20073e0e39258b0\nb7/d0f7f2fe5498c5845a974df475132634af4a74\nbb/9bffcbef6166cf03385fbcde97c27bc1a5e689\nbf/12fe2ba57544a73e0cc33858973f842e6490d3\nc1/c9aa8a8e8fe3a3ffd5559ff0432bcb0a7249d8\nc2/a7103979aff61109bdc6c6d572238338b79ce3\ncf/04dd7d7b54dd2cb21ff305dae41a770278bf4e\nd5/aa207e46ff7ee838683a7d95ecf46fe42a9a56\nd6/66db0d6c68a8bc887e65e873d84ffa2c7e02d8\nd8/c98e6ebdade1c73ea6926b6be3d86d9ade9cb6\ndd/b7d643d247c1f7650245794433b7c1eec92331\ndd/e77151cc2360c15c804ef82eb1fd628e53f10e\ndf/0d2d760073f9bd841a85ed0e1d758c8bacd3e3\ndf/4e2c7e4254667485a73c0b8960151fe47043f2\ne3/06d25a5ad1ad6b22aefbdf8bb5e557cead1e4b\ne8/e6993178344eb348f60f05b16d9dc30db3b9cf\neb/42422f72456e40a1152ae0ce4f4df44f4d1ef5\ned/562ab12733ab75437b3390427d41fce9da83c3\ned/867db550a9da16a690a9a122b28d33491ac6f8\nf5/0443f1c9ea6c85a2733e67840d4860cdab4d3b\nf8/50fb0fb5118be47d976291ee028697fbdeb688\nf8/e191827f6ff913d083a89028b1b732ef56b231\n\nsent 1674 bytes  received 1186530 bytes  34440.70 bytes/sec\ntotal size is 70393608  speedup is 59.24\n\nreceiving file list ... done\nclient: nothing to do: perhaps you need to specify some filenames or the --recursive option?\n\nreceiving file list ... done\nclient: nothing to do: perhaps you need to specify some filenames or the --recursive option?\nunable to get tags list (non-fatal)\nTree change: a6ad57fb4b5e9d68553f4440377b99f75588fa88:e8e6993178344eb348f60f05b16d9dc30db3b9cf\n*100644->100644\tblob\t8da3a306d0c0c070d87048d14a033df02f40a154->48990899db0d9a9506e72fe2fa79570c3b5a306b\tMakefile\n*100644->100644\tblob\tc397e71f938d0f79fbcbf29869fbb1d40cf09306->72b03f201eb946f97c9f419090d683ece6ea5bc1\tarch/arm/common/rtctime.c\n*100644->100644\tblob\t68e15c36e33610d6ed0ccec61d7d7a23ebcd4fa3->3b948e8c27513f7896263a87a99123ad5394b860\tarch/arm/mach-integrator/integrator_cp.c\n*100644->100644\tblob\t20729de2af285d62102691ef20942f7caab184af->1a844ca139e0df85e57cee2a67916aa305b1ffcb\tarch/arm/mach-integrator/time.c\n*100644->100644\tblob\tb1575b8dc1cd3e043f78794c56df9d57e6e96afa->a45aaa115a76664bb81438455b06a6ff890886f7\tarch/arm/mach-pxa/generic.c\n*100644->100644\tblob\t314c7146e9bf0a58c9df75c86065b4ad7598b419->04783ceb050c13d7a475a60bdb916b6eb56ffddf\tarch/i386/Makefile\n*100644->100644\tblob\t774de8e2387193be0570a3fba681fd6dd1936816->f850fb0fb5118be47d976291ee028697fbdeb688\tarch/ppc/boot/images/Makefile\n*100644->100644\tblob\tb0e167db6af9c68f49949d409abc747d3119842f->3c2fa5c284c04ef223c468c2df53f6c7676dc20a\tarch/ppc64/kernel/signal32.c\n*100644->100644\tblob\t8e61be34a1d328c5a948a646504ad65629eaef62->ed867db550a9da16a690a9a122b28d33491ac6f8\tdrivers/char/s3c2410-rtc.c\n*100644->100644\tblob\t3e386fd4c5c6e627699ccd04117b712030f0f3f4->321dbe91dc14e270450216cf4cc79562d89ca225\tdrivers/video/amba-clcd.c\n*100644->100644\tblob\t4d2404305ab687c2a0eee84b3c5842ba9852965a->95483baab706baa9921eb14757c08da90970fdb5\tfs/cifs/CHANGES\n*100644->100644\tblob\t1e8490ed694878b3bbed1e96ab792791ddf1daed->8cc881694e2911d0a2eff3ca7eb5dd5efc0503d3\tfs/cifs/TODO\n*100644->100644\tblob\tb004fef0a42bac42e8b3490fba19df1ea233762d->741ff0c69f37f44154247020649b4104afff0cda\tfs/cifs/cifssmb.c\n*100644->100644\tblob\td31c1a71f781ccc7c189e3bff9dc1ee4ee282188->1ab353e235955eee63e43a3a030d0b8b4b719a2b\tinclude/asm-arm/arch-integrator/cm.h\n*100644->100644\tblob\taa7e16b2e2255fbcc0f5aef2cf72c241daf2f81b->370dfe77589d2abd9d8a963772fc79072feba5c0\tinclude/asm-arm/rtc.h\n\nApplying changes...\nFast-forwarding a6ad57fb4b5e9d68553f4440377b99f75588fa88 -> e8e6993178344eb348f60f05b16d9dc30db3b9cf\n\ton top of a6ad57fb4b5e9d68553f4440377b99f75588fa88...\nThe next patch would create the file arch/ia64/sn/include/pci/pcibus_provider_defs.h,\nwhich already exists!  Skipping patch.\n1 out of 1 hunk ignored -- saving rejects to file arch/ia64/sn/include/pci/pcibus_provider_defs.h.rej\nThe next patch would create the file arch/ia64/sn/include/pci/pcidev.h,\nwhich already exists!  Skipping patch.\n1 out of 1 hunk ignored -- saving rejects to file arch/ia64/sn/include/pci/pcidev.h.rej\n\nThe diff between these two IDs is:\n\n$ cg-diff -r a6ad57fb4b5e9d68553f4440377b99f75588fa88:e8e6993178344eb348f60f05b16d9dc30db3b9cf| diffstat\n Makefile                                 |    6 ++++--\n arch/arm/common/rtctime.c                |   29 +++++++++++++++--------------\n arch/arm/mach-integrator/integrator_cp.c |   17 ++++++++++++++++-\n arch/arm/mach-integrator/time.c          |   17 ++++++++++++-----\n arch/arm/mach-pxa/generic.c              |   25 +++++++++++++++++++++++++\n arch/i386/Makefile                       |    7 ++++---\n arch/ppc/boot/images/Makefile            |    3 ++-\n arch/ppc64/kernel/signal32.c             |    4 ++--\n drivers/char/s3c2410-rtc.c               |    8 ++++++--\n drivers/video/amba-clcd.c                |    8 ++++----\n fs/cifs/CHANGES                          |    4 +++-\n fs/cifs/TODO                             |   12 ++++++++++--\n fs/cifs/cifssmb.c                        |    6 ++++--\n include/asm-arm/arch-integrator/cm.h     |    6 +++---\n include/asm-arm/rtc.h                    |    4 ++--\n 15 files changed, 112 insertions(+), 44 deletions(-)\n\nwhich doesn't touch those files it's complaining about.  So something's\nup with the merging process - I don't see why we'd even be trying to\ntouch these two files.\n\n-- \nRussell King\n\n"},{"id":"2324","messageId":"20050501224025.A2079@flint.arm.linux.org.uk","threadId":"413","inReplyTo":"20050501092743.B7459@flint.arm.linux.org.uk","subject":"Re: Todays update (with cogito 0.8)","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-05-01T21:40:25Z","receivedAt":"2005-05-01T21:40:25Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"On Sun, May 01, 2005 at 09:27:43AM +0100, Russell King wrote:\n> receiving file list ... done\n> client: nothing to do: perhaps you need to specify some filenames or the --recursive option?\n> unable to get tags list (non-fatal)\n> Tree change: a6ad57fb4b5e9d68553f4440377b99f75588fa88:e8e6993178344eb348f60f05b16d9dc30db3b9cf\n> *100644->100644\tblob\t8da3a306d0c0c070d87048d14a033df02f40a154->48990899db0d9a9506e72fe2fa79570c3b5a306b\tMakefile\n> *100644->100644\tblob\tc397e71f938d0f79fbcbf29869fbb1d40cf09306->72b03f201eb946f97c9f419090d683ece6ea5bc1\tarch/arm/common/rtctime.c\n> *100644->100644\tblob\t68e15c36e33610d6ed0ccec61d7d7a23ebcd4fa3->3b948e8c27513f7896263a87a99123ad5394b860\tarch/arm/mach-integrator/integrator_cp.c\n> *100644->100644\tblob\t20729de2af285d62102691ef20942f7caab184af->1a844ca139e0df85e57cee2a67916aa305b1ffcb\tarch/arm/mach-integrator/time.c\n> *100644->100644\tblob\tb1575b8dc1cd3e043f78794c56df9d57e6e96afa->a45aaa115a76664bb81438455b06a6ff890886f7\tarch/arm/mach-pxa/generic.c\n> *100644->100644\tblob\t314c7146e9bf0a58c9df75c86065b4ad7598b419->04783ceb050c13d7a475a60bdb916b6eb56ffddf\tarch/i386/Makefile\n> *100644->100644\tblob\t774de8e2387193be0570a3fba681fd6dd1936816->f850fb0fb5118be47d976291ee028697fbdeb688\tarch/ppc/boot/images/Makefile\n> *100644->100644\tblob\tb0e167db6af9c68f49949d409abc747d3119842f->3c2fa5c284c04ef223c468c2df53f6c7676dc20a\tarch/ppc64/kernel/signal32.c\n> *100644->100644\tblob\t8e61be34a1d328c5a948a646504ad65629eaef62->ed867db550a9da16a690a9a122b28d33491ac6f8\tdrivers/char/s3c2410-rtc.c\n> *100644->100644\tblob\t3e386fd4c5c6e627699ccd04117b712030f0f3f4->321dbe91dc14e270450216cf4cc79562d89ca225\tdrivers/video/amba-clcd.c\n> *100644->100644\tblob\t4d2404305ab687c2a0eee84b3c5842ba9852965a->95483baab706baa9921eb14757c08da90970fdb5\tfs/cifs/CHANGES\n> *100644->100644\tblob\t1e8490ed694878b3bbed1e96ab792791ddf1daed->8cc881694e2911d0a2eff3ca7eb5dd5efc0503d3\tfs/cifs/TODO\n> *100644->100644\tblob\tb004fef0a42bac42e8b3490fba19df1ea233762d->741ff0c69f37f44154247020649b4104afff0cda\tfs/cifs/cifssmb.c\n> *100644->100644\tblob\td31c1a71f781ccc7c189e3bff9dc1ee4ee282188->1ab353e235955eee63e43a3a030d0b8b4b719a2b\tinclude/asm-arm/arch-integrator/cm.h\n> *100644->100644\tblob\taa7e16b2e2255fbcc0f5aef2cf72c241daf2f81b->370dfe77589d2abd9d8a963772fc79072feba5c0\tinclude/asm-arm/rtc.h\n> \n> Applying changes...\n> Fast-forwarding a6ad57fb4b5e9d68553f4440377b99f75588fa88 -> e8e6993178344eb348f60f05b16d9dc30db3b9cf\n> \ton top of a6ad57fb4b5e9d68553f4440377b99f75588fa88...\n> The next patch would create the file arch/ia64/sn/include/pci/pcibus_provider_defs.h,\n> which already exists!  Skipping patch.\n> 1 out of 1 hunk ignored -- saving rejects to file arch/ia64/sn/include/pci/pcibus_provider_defs.h.rej\n> The next patch would create the file arch/ia64/sn/include/pci/pcidev.h,\n> which already exists!  Skipping patch.\n> 1 out of 1 hunk ignored -- saving rejects to file arch/ia64/sn/include/pci/pcidev.h.rej\n\nOk.  Some further information.\n\nI ran cg-diff, which said that these two files were new, and not part\nof the kernel tree anymore.  So I removed them.  cg-diff was then happy.\n\nI've just done another update, and they've magically reappeared again.\n\nstrings -a .git/index | grep arch/ia64/sn/include/pci/pcidev.h\n\nshows they exist.  After running read-tree $(tree-id) and\nupdate-cache --refresh I think everything's fine again - these files\nhave certainly gone from the index file.\n\nSo it seems that merging in cogito-0.8 isn't working correctly - known\nproblem or new problem?\n\n-- \nRussell King\n\n"}]}