)]}' { "log": [ { "commit": "83ef7c75939f45f8da46976cdca4db0727276a2d", "tree": "65463156511af958e28f4fabc3acdfa2dd3798f9", "parents": [ "269fe1023191a338736c71ba4f4db13839747772" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:12 2010 +0200" }, "message": "tools/firewire: nosy-dump: use linux/firewire-constants.h\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "269fe1023191a338736c71ba4f4db13839747772", "tree": "eb49afb2d44ec2e1422a105ce6f1e77f6c7256a2", "parents": [ "468066f771032ad4bef4a906dfe0b0a55593d64d" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:12 2010 +0200" }, "message": "tools/firewire: nosy-dump: break up a deeply nested function\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "468066f771032ad4bef4a906dfe0b0a55593d64d", "tree": "8b06137d89b1a088e6c604d2abd9d997b722282d", "parents": [ "92c16f7e9c65f9a271c6bd5020279b3e37989672" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:12 2010 +0200" }, "message": "tools/firewire: nosy-dump: make some symbols static or const\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "92c16f7e9c65f9a271c6bd5020279b3e37989672", "tree": "f9e671c2ba4bcc51c1e27072e6b6256620af9538", "parents": [ "a8461c0f3bfffe752fc62ce3960eb827463e90b5" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:12 2010 +0200" }, "message": "tools/firewire: nosy-dump: change to kernel coding style\n\nThis changes only\n - whitespace\n - C99 initializers\n - comment style\n - order of #includes\n - if { } else { } bracing\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "a8461c0f3bfffe752fc62ce3960eb827463e90b5", "tree": "6f084345ddad45459397846a069dc5fde7a3b736", "parents": [ "1bcc69fb6a48edb3ddf2e8c42f1d1c242196bf74" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:12 2010 +0200" }, "message": "tools/firewire: nosy-dump: work around segfault in decode_fcp\n\nIf I run \"nosy-dump --view\u003dtransaction\" with my camcorder on battery\ninstead of mains, it segfaults very quickly because of !t-\u003erequest.\nPerhaps this is because of increased likelyhood of incomplete\ntransactions (ack_busy when host writes to camcorder\u0027s FCP_Request)\nand a bug deeper in nosy-dump\u0027s transaction housekeeping. This is a\nquick workaround to get me going.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "1bcc69fb6a48edb3ddf2e8c42f1d1c242196bf74", "tree": "0399ebe11dc5a153d22acef24c67c27aa85eb0ab", "parents": [ "9f6d3c4b76314c40c866a935d78c80fd284768bd" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "tools/firewire: nosy-dump: fix it on x86-64\n\nReplace \u0027unsigned long\u0027 and the (unaffected) \u0027unsigned int\u0027 by uint32_t\nif they represent quadlets.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "9f6d3c4b76314c40c866a935d78c80fd284768bd", "tree": "ccb994e8ebe7a36b8bed804c79ce9f117455f041", "parents": [ "aed69d2b79bb5af008526998e466da6d0eac7ae5" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:58:05 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "tools/firewire: add userspace front-end of nosy\n\nThis adds nosy-dump, the userspace part of nosy, the IEEE 1394 traffic\nsniffer for Texas Instruments PCILynx/ PCILynx2 based cards. Author is\nKristian Høgsberg.\n\nThe files added here are taken from\ngit://anongit.freedesktop.org/~krh/nosy commit ee29be97 (2009-11-10)\nwith the following changes by Stefan Richter:\n - Parts pertaining to the kernel module removed from Makefile.\n - dist target removed from the Makefile.\n - Mentioned nosy-dump in the Kconfig help to nosy\u0027s kernel component.\n - Add copyright notice to nosy-dump.c. This is a duplicate of the\n respective notice in the kernel component nosy.c except for a time\n span of 2002 - 2006, according to Kristian\u0027s git log.\n\n\"git shortlog decode-fcp.c list.h nosy-dump.[ch]\" from nosy\u0027s git\nrepository:\n\nJonathan Woithe (1):\n Save logs on Ctrl-C\n\nKristian Høgsberg (11):\n Pull over nosy from mercurial repo.\n Remove some fields from default view, add logging feature.\n Use infinite time out for poll(), mark more detail fields.\n Fix byte ordering macro.\n Add decoding of iso data and lock packets.\n Add flag to indicate data length field.\n Add cycle start packet decoding, add --iso and --cycle-start flags.\n Distinguish between phy-packets and 0-length iso data.\n Fix transaction and stats view.\n Add simple AV/C decoder.\n Don\u0027t break down on big payloads.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nAcked-by: Kristian Høgsberg \u003ckrh@bitplanet.net\u003e\n" }, { "commit": "aed69d2b79bb5af008526998e466da6d0eac7ae5", "tree": "98d300a07856cbb7c88d4cd43347ba5efa842b9d", "parents": [ "7429b17d30a19fd52a0c07de9d3959746d321e15" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 19:50:32 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "firewire: nosy: note ioctls in ioctl-number.txt\n\nThese are the ioctls for the special-purpose misc device /dev/nosy, the\ninterface to the IEEE 1394 packet sniffer/ protocol analyzer driver.\nCurrently only the numbers 00...02 are in use; let\u0027s block a few more\nfor unforeseen use cases.\n\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "7429b17d30a19fd52a0c07de9d3959746d321e15", "tree": "2dc1e07547893ed804fd06b84eb24a86a38cc571", "parents": [ "fd8c8d46ca9402c15383d2cf0bc3ee7740de3b62" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "firewire: nosy: use generic printk macros\n\nReplace home-grown printk wrapper macros by ones from kernel.h and\ndevice.h.\n\nAlso raise the log level in set_phy_reg() from debug to error because\nthese are really error conditions. Could even be WARN_ON. Lower the\nlog level in the device probe and driver shutdown from notice to info.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "fd8c8d46ca9402c15383d2cf0bc3ee7740de3b62", "tree": "66a33db3ea837f2fb6c66e077a9b5fae7009c3ba", "parents": [ "c89db7b8bc88d8288dcfbe7a885b950d2560d564" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "firewire: nosy: endianess fixes and annotations\n\n1.) The DMA programs (struct pcl) are PCI-endian \u003d little endian data\n(except for the 3rd quadlet in a PCL which the controller does not\ntouch). Annotate them as such.\n\nFix all accesses of the PCL to work with big endian CPUs also. Not\nactually tested, I only have a little endian PC to test with. This\nincludes replacement of a bitfield struct pcl_status by open-coded\nshift and mask operations.\n\n2.) The two __attribute__ ((packed)) at struct pcl are not really\nrequired since it consists of u32/__le32 only, i.e. there will be no\npadding with or without the attribute.\n\n3.) The received IEEE 1394 data are byteswapped by the controller from\nIEEE 1394 endian \u003d big endian to PCI endian \u003d little endian because the\nPCL_BIGENDIAN control bit is set. Therefore annotate the DMA buffer as\na __le32 array.\n\nFix the one access of the DMA buffer (the check of the transaction code\nof link packets) to work with big endian CPUs. Also fix the two\naccesses of the client bounce buffer (the reading of packet length).\n\n4.) Add a comment to the userspace ABI header that all of the data gets\nout as little endian data, except for the timestamp which is CPU endian.\n(We could make it little endian too, but why? Vice versa, an ioctl\ncould be added to dump packet data in big endian byte order...)\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "c89db7b8bc88d8288dcfbe7a885b950d2560d564", "tree": "b6588c1c885f6219a55aff794681e39062408ad4", "parents": [ "424d66cedae8bebb00fdb917fc8430f7b8a655cf" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "firewire: nosy: annotate __user pointers and __iomem pointers\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "424d66cedae8bebb00fdb917fc8430f7b8a655cf", "tree": "cd232df29974be404978d47a2257c9422272d304", "parents": [ "b6d9c125e6610591c04ca9045f641e35ce1a9226" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:11 2010 +0200" }, "message": "firewire: nosy: fix device shutdown with active client\n\nFix race between nosy_open() and remove_card() by replacing the\nunprotected array of card pointers by a mutex-protected list of cards.\n\nMake card instances reference-counted and let each client hold a\nreference.\n\nNotify clients about card removal via POLLHUP in poll()\u0027s events\nbitmap; also let read() fail with errno\u003dENODEV if the card was removed\nand everything in the buffer was read.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "b6d9c125e6610591c04ca9045f641e35ce1a9226", "tree": "416672c79a3ee4b0764561ba5ebcf9ed3ba4d5c7", "parents": [ "165476671f731b4c3d6cf401d0e1886f4a4f4a8e" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: handle errors in device probe\n\nand add a missing pci_disable_device() to device shutdown.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "165476671f731b4c3d6cf401d0e1886f4a4f4a8e", "tree": "59bba3913c7bb3a023394bce86bb0ea79d95f1ed", "parents": [ "55e77c06c6017a70630cf599770369b8ba07c841" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: fix IRQ handler for card ejection\n\nUntested, I don\u0027t have a PCILynx CardBus card.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "55e77c06c6017a70630cf599770369b8ba07c841", "tree": "5fe5940bd0e0326afad0898b521490b53c894adf", "parents": [ "685c3f80b6d88478a6428676f9daab59faf3cd4b" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: unroll some simple functions\n\nnosy_start/stop_snoop() and nosy_add/remove_client() are simple enough\nto be inlined into their callers.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "685c3f80b6d88478a6428676f9daab59faf3cd4b", "tree": "3f1f93927c0241ba12d887bcf7b90fc52d760884", "parents": [ "a2d39db9dec0e7e403f54c9cf98b7dbc82b4c44a" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: use flagless variants of spinlock accessors\n\nnosy_start/stop_snoop() are always only called by the ioctl method, i.e.\nwith IRQs enabled. packet_handler() and bus_reset_handler() are always\nonly called by the IRQ handler. Hence neither one needs to track IRQ\nflags.\n\nTo underline the call context of packet_handler() and\nbus_reset_handler(), rename these functions to *_irq_handler().\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "a2d39db9dec0e7e403f54c9cf98b7dbc82b4c44a", "tree": "86e4e8447f83cefa4ae4809051fffad04b8229ef", "parents": [ "c7b2a99c66e7b40d8843a70f2981e375eeedf062" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: fix list corruption by NOSY_IOC_STOP\n\nnosy_stop_snoop() would blow up the second time it was called without\nnosy_start_snoop() in between.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "c7b2a99c66e7b40d8843a70f2981e375eeedf062", "tree": "56039d14506b685e009f0b501264cba08d3e5484", "parents": [ "b5e47729043c9224b21ab3dc7c63e8a38dbb4923" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 22 11:56:38 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: convert to unlocked ioctl\n\nThe required serialization of NOSY_IOC_START and NOSY_IOC_STOP is\nalready provided by the client_list_lock.\n\nNOSY_IOC_FILTER does not really require serialization since accesses\nto tcode_mask are atomic on any sane CPU architecture. Nevertheless,\nmake it explicit that we want this to be atomic by means of\nclient_list_lock (which also surrounds the other tcode_mask access in\nthe IRQ handler). While we are at it, change the type of tcode_mask to\nu32 for consistency with the user API.\n\nNOSY_IOC_GET_STATS does not require serialization against itself. But\nthere is a bug here regarding concurrent updates of the two counters\nby the IRQ handler. Fix it by taking the client_list_lock in this ioctl\ntoo.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "b5e47729043c9224b21ab3dc7c63e8a38dbb4923", "tree": "2acf6aa0f441c3a6b8812c8c5eb3b97a74f98056", "parents": [ "286468210d83ce0ca1e37e346ed9f4457a161650" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 10:28:30 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: nosy: misc cleanups\n\nExtend copyright note to 2007, c.f. Kristian\u0027s git log.\n\nIncludes:\n - replace some \u003casm/*.h\u003e by \u003clinux/*.h\u003e\n - add required indirectly included \u003clinux/spinlock.h\u003e\n - order alphabetically\n\nCoding style related changes:\n - change to utf8\n - normalize whitespace\n - normalize comment style\n - remove usages of __FUNCTION__\n - remove an unnecessary cast from void *\n\nConst and static declarations:\n - driver_name is not const in pci_driver.name, drop const qualifier\n - driver_name can be taken from KBUILD_MODNAME\n - the global variable minors[] can and should be static\n - constify struct file_operations instance\n\nData types:\n - Remove unused struct member struct packet.code. struct packet is\n only used for driver-internal bookkeeping; it does not appear on the\n wire or in DMA programs or the userspace ABI. Hence the unused\n member .code can be removed without worries.\n\nPreprocessor macros:\n - unroll a preprocessor macro that containd a return\n - use list_for_each_entry\n\nPrintk:\n - add missing terminating \\n in some format strings\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "286468210d83ce0ca1e37e346ed9f4457a161650", "tree": "e445a09a6a074e3ae65479e417d41d4d1c41f571", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 10:26:33 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 27 11:04:10 2010 +0200" }, "message": "firewire: new driver: nosy - IEEE 1394 traffic sniffer\n\nThis adds the traffic sniffer driver for Texas Instruments PCILynx/\nPCILynx2 based cards. The use cases for nosy are analysis of\nnonstandard protocols and as an aid in development of drivers,\napplications, or firmwares.\n\nAuthor of the driver is Kristian Høgsberg. Known contributers are\nJody McIntyre and Jonathan Woithe.\n\nNosy programs PCILynx chips to operate in promiscuous mode, which is a\nfeature that is not found in OHCI-1394 controllers. Hence, only special\nhardware as mentioned in the Kconfig help text is suitable for nosy.\n\nThis is only the kernelspace part of nosy. There is a userspace\ninterface to it, called nosy-dump, proposed to be added into the tools/\nsubdirectory of the kernel sources in a subsequent change. Kernelspace\nand userspave component of nosy communicate via a \u0027misc\u0027 character\ndevice file called /dev/nosy with a simple ioctl() and read() based\nprotocol, as described by nosy-user.h.\n\nThe files added here are taken from\ngit://anongit.freedesktop.org/~krh/nosy commit ee29be97 (2009-11-10)\nwith the following changes by Stefan Richter:\n - Kconfig and Makefile hunks are written from scratch.\n - Commented out version printk in nosy.c.\n - Included missing \u003clinux/sched.h\u003e, reported by Stephen Rothwell.\n\n\"git shortlog nosy{-user.h,.c,.h}\" from nosy\u0027s git repository:\n\nJonathan Woithe (2):\n Nosy updates for recent kernels\n Fix uninitialised memory (needed for 2.6.31 kernel)\n\nKristian Høgsberg (5):\n Pull over nosy from mercurial repo.\n Use a misc device instead.\n Add simple AV/C decoder.\n Don\u0027t break down on big payloads.\n Set parent device for misc device.\n\nAs a low-level IEEE 1394 driver, its files are placed into\ndrivers/firewire/ although nosy is not part of the firewire driver\nstack.\n\nI am aware of the following literature from Texas Instruments about\nPCILynx programming:\n SCPA020A - PCILynx 1394 to PCI Bus Interface TSB12LV21BPGF\n Functional Specification\n SLLA023 - Initialization and Asynchronous Programming of the\n TSB12LV21A 1394 Device\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nAcked-by: Kristian Høgsberg \u003ckrh@bitplanet.net\u003e\n" }, { "commit": "e40152ee1e1c7a63f4777791863215e3faa37a86", "tree": "434d237e8e6fdac43ae4a4a54bc69a24d9a4f088", "parents": [ "b5dbc858717113c823fe6bb058807c2cb67d1efa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 14:17:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 14:17:36 2010 -0700" }, "message": "Linus 2.6.34\n" }, { "commit": "b5dbc858717113c823fe6bb058807c2cb67d1efa", "tree": "e82858156bf5d46b539455728ac1b8a7cd9feb02", "parents": [ "d34e14f690d611ffe3db09e4ed8123d86c89a831", "c02db8c6290bb992442fec1407643c94cc414375" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 11:11:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 11:11:53 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n rtnetlink: make SR-IOV VF interface symmetric\n sctp: delete active ICMP proto unreachable timer when free transport\n tcp: fix MD5 (RFC2385) support\n" }, { "commit": "d34e14f690d611ffe3db09e4ed8123d86c89a831", "tree": "dc7d6716e2550834816e29e5928a60c00c97d9fc", "parents": [ "18e41da89d55014d25b9a24502ee92b7f50599f9", "4e73238d163c6fcf001264832701d2a6d4927672" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 11:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 11:11:31 2010 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://ftp.linux-mips.org/pub/scm/upstream-linus\n\n* \u0027upstream\u0027 of git://ftp.linux-mips.org/pub/scm/upstream-linus:\n MIPS: Oprofile: Fix Loongson irq handler\n MIPS: N32: Use compat version for sys_ppoll.\n MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1\n" }, { "commit": "c02db8c6290bb992442fec1407643c94cc414375", "tree": "05ec7bdd7efc005cd9e3905e0d6f6469bf08668b", "parents": [ "55fa0cfd7c3ac2ae34cac7dca2e3fbcfe661e6c3" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sun May 16 01:05:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 01:05:45 2010 -0700" }, "message": "rtnetlink: make SR-IOV VF interface symmetric\n\nNow we have a set of nested attributes:\n\n IFLA_VFINFO_LIST (NESTED)\n IFLA_VF_INFO (NESTED)\n IFLA_VF_MAC\n IFLA_VF_VLAN\n IFLA_VF_TX_RATE\n\nThis allows a single set to operate on multiple attributes if desired.\nAmong other things, it means a dump can be replayed to set state.\n\nThe current interface has yet to be released, so this seems like\nsomething to consider for 2.6.34.\n\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55fa0cfd7c3ac2ae34cac7dca2e3fbcfe661e6c3", "tree": "0f9ccf2d00a10a88f601245fced3581f49f93862", "parents": [ "35790c0421121364883a167bab8a2e37e1f67f78" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Sun May 09 16:56:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 00:46:22 2010 -0700" }, "message": "sctp: delete active ICMP proto unreachable timer when free transport\n\ntransport may be free before ICMP proto unreachable timer expire, so\nwe should delete active ICMP proto unreachable timer when transport\nis going away.\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35790c0421121364883a167bab8a2e37e1f67f78", "tree": "a3e032a9ba6bb77337176bef407d7408d6a10a4d", "parents": [ "d77f873fdd21912803836da78f627d2efd267082" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun May 16 00:34:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 00:34:04 2010 -0700" }, "message": "tcp: fix MD5 (RFC2385) support\n\nTCP MD5 support uses percpu data for temporary storage. It currently\ndisables preemption so that same storage cannot be reclaimed by another\nthread on same cpu.\n\nWe also have to make sure a softirq handler wont try to use also same\ncontext. Various bug reports demonstrated corruptions.\n\nFix is to disable preemption and BH.\n\nReported-by: Bhaskar Dutta \u003cbhaskie@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e73238d163c6fcf001264832701d2a6d4927672", "tree": "bf8b9aa38ffec794d44cb1a81ee99c52e4d6b5f0", "parents": [ "46afb8296c2494bfce17064124b253eb9b176ef9" ], "author": { "name": "Wu Zhangjin", "email": "wuzhangjin@gmail.com", "time": "Fri May 07 00:59:46 2010 +0800" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat May 15 21:59:54 2010 +0100" }, "message": " MIPS: Oprofile: Fix Loongson irq handler\n \n The interrupt enable bit for the performance counters is in the Control\n Register $24, not in the counter register.\n loongson2_perfcount_handler(), we need to use\n \n Reported-by: Xu Hengyang \u003chengyang@mail.ustc.edu.cn\u003e\n Signed-off-by: Wu Zhangjin \u003cwuzhangjin@gmail.com\u003e\n Cc: linux-mips@linux-mips.org\n Patchwork: http://patchwork.linux-mips.org/patch/1198/\n Signed-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n---\n" }, { "commit": "46afb8296c2494bfce17064124b253eb9b176ef9", "tree": "709fc3151984e294f27e54a67bfe9f9387a377fb", "parents": [ "95e8f634d7a3ea5af40ec3fa42c8a152fd3a0624" ], "author": { "name": "Chandrakala Chavva", "email": "cchavva@caviumnetworks.com", "time": "Mon May 10 17:11:54 2010 -0700" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat May 15 21:59:53 2010 +0100" }, "message": " MIPS: N32: Use compat version for sys_ppoll.\n \n The sys_ppoll() takes struct \u0027struct timespec\u0027. This is different for the\n N32 and N64 ABIs. Use the compat version to do the proper conversions.\n \n Signed-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\n To: linux-mips@linux-mips.org\n Patchwork: http://patchwork.linux-mips.org/patch/1210/\n Signed-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n---\n" }, { "commit": "95e8f634d7a3ea5af40ec3fa42c8a152fd3a0624", "tree": "67da92dd5fa7fc27ebd25a9b524166ef182793ae", "parents": [ "3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f" ], "author": { "name": "Shane McDonald", "email": "mcdonald.shane@gmail.com", "time": "Thu May 06 23:26:57 2010 -0600" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat May 15 21:59:53 2010 +0100" }, "message": " MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1\n \n In the FPU emulator code of the MIPS, the Cause bits of the FCSR register\n are not currently writeable by the ctc1 instruction. In odd corner cases,\n this can cause problems. For example, a case existed where a divide-by-zero\n exception was generated by the FPU, and the signal handler attempted to\n restore the FPU registers to their state before the exception occurred. In\n this particular setup, writing the old value to the FCSR register would\n cause another divide-by-zero exception to occur immediately. The solution\n is to change the ctc1 instruction emulator code to allow the Cause bits of\n the FCSR register to be writeable. This is the behaviour of the hardware\n that the code is emulating.\n \n This problem was found by Shane McDonald, but the credit for the fix goes\n to Kevin Kissell. In Kevin\u0027s words:\n \n I submit that the bug is indeed in that ctc_op: case of the emulator. The\n Cause bits (17:12) are supposed to be writable by that instruction, but the\n CTC1 emulation won\u0027t let them be updated by the instruction. I think that\n actually if you just completely removed lines 387-388 [...] things would\n work a good deal better. At least, it would be a more accurate emulation of\n the architecturally defined FPU. If I wanted to be really, really pedantic\n (which I sometimes do), I\u0027d also protect the reserved bits that aren\u0027t\n necessarily writable.\n \n Signed-off-by: Shane McDonald \u003cmcdonald.shane@gmail.com\u003e\n To: anemo@mba.ocn.ne.jp\n To: kevink@paralogos.com\n To: sshtylyov@mvista.com\n Patchwork: http://patchwork.linux-mips.org/patch/1205/\n Signed-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n---\n" }, { "commit": "18e41da89d55014d25b9a24502ee92b7f50599f9", "tree": "5ce8ebd7456f377e4cfbff0ae83e84295617a4a8", "parents": [ "43aa7ac736a4e21aae4882bd8f7c67403aed45b8", "5dc6416414fb3ec6e2825fd4d20c8bf1d7fe0395" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:55:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:55:31 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: check for read permission on src file in the clone ioctl\n" }, { "commit": "43aa7ac736a4e21aae4882bd8f7c67403aed45b8", "tree": "8ebbe9c6053c6552de8ee120384afb1b02bf8f47", "parents": [ "bdef2fe88b1e4bde7458aedd207929ce3f9d66ee" ], "author": { "name": "kirjanov@gmail.com", "email": "kirjanov@gmail.com", "time": "Sat May 15 12:32:34 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:48:10 2010 -0700" }, "message": "lib/btree: fix possible NULL pointer dereference\n\nmempool_alloc() can return null in atomic case.\n\nSigned-off-by: Denis Kirjanov \u003ckirjanov@gmail.com\u003e\nCc: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bdef2fe88b1e4bde7458aedd207929ce3f9d66ee", "tree": "379dda36d68de2ed79bfe08764378e28503c6190", "parents": [ "3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Sat May 15 12:32:31 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:48:10 2010 -0700" }, "message": "mmc: at91_mci: modify cache flush routines\n\nAs we were using an internal dma flushing routine, this patch changes to\nthe DMA API flush_kernel_dcache_page(). Driver is able to compile now.\n\n[akpm@linux-foundation.org: flush_kernel_dcache_page() comes before kunmap_atomic()]\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5dc6416414fb3ec6e2825fd4d20c8bf1d7fe0395", "tree": "e15101a2d1302ff6f2830f282197b34060ec963c", "parents": [ "9f680ce04ea19dabbbafe01b57b61930a9b70741" ], "author": { "name": "Dan Rosenberg", "email": "dan.j.rosenberg@gmail.com", "time": "Sat May 15 11:27:37 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 15 12:05:50 2010 -0400" }, "message": "Btrfs: check for read permission on src file in the clone ioctl\n\nThe existing code would have allowed you to clone a file that was\nonly open for writing\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f", "tree": "86792764365ca7b40a21e5eb8fc4f7b355088535", "parents": [ "c28f3f8660697d03afbdb581781b94ff6222a585", "684bdc7ff95e0c1d4b0bcf236491840b55a54189" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 09:03:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 09:03:15 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n JFS: Free sbi memory in error path\n fs/sysv: dereferencing ERR_PTR()\n Fix double-free in logfs\n Fix the regression created by \"set S_DEAD on unlink()...\" commit\n" }, { "commit": "c28f3f8660697d03afbdb581781b94ff6222a585", "tree": "ea7f4a90f43df3bb44d2c85929a369ce5b2a352c", "parents": [ "bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f", "46db2c3205ca6e24adbb9b038441bc8f65360535" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 09:03:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 09:03:02 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf record: Add a fallback to the reference relocation symbol\n" }, { "commit": "684bdc7ff95e0c1d4b0bcf236491840b55a54189", "tree": "10eada69ce686f903fbf01d2e40311371d5b98e5", "parents": [ "404e781249f003a37a140756fc4aeae463dcb217" ], "author": { "name": "Jan Blunck", "email": "jblunck@suse.de", "time": "Mon Apr 12 16:44:08 2010 -0700" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 15 07:16:34 2010 -0400" }, "message": "JFS: Free sbi memory in error path\n\nI spotted the missing kfree() while removing the BKL.\n\n[akpm@linux-foundation.org: avoid multiple returns so it doesn\u0027t happen again]\nSigned-off-by: Jan Blunck \u003cjblunck@suse.de\u003e\nCc: Dave Kleikamp \u003cshaggy@austin.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "404e781249f003a37a140756fc4aeae463dcb217", "tree": "5eb0f81657ebecdd747583df54a261a4e305df3f", "parents": [ "265624495f5acf6077f8f8d264f8170573d8d752" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Apr 21 12:30:32 2010 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 15 07:16:33 2010 -0400" }, "message": "fs/sysv: dereferencing ERR_PTR()\n\nI moved the dir_put_page() inside the if condition so we don\u0027t dereference\n\"page\", if it\u0027s an ERR_PTR().\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "265624495f5acf6077f8f8d264f8170573d8d752", "tree": "76e1b8cce3ac0116ade7df91c0d64471cf7cc03d", "parents": [ "d83c49f3e36cecd2e8823b6c48ffba083b8a5704" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Apr 28 20:57:02 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 15 07:16:33 2010 -0400" }, "message": "Fix double-free in logfs\n\niput() is needed *until* we\u0027d done successful d_alloc_root()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d83c49f3e36cecd2e8823b6c48ffba083b8a5704", "tree": "a304de4eb43652d2a9528d4b43f798ab821c8b93", "parents": [ "6a251b0ab67989f468f4cb65179e0cf40cf8c295" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 30 17:17:09 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 15 07:16:33 2010 -0400" }, "message": "Fix the regression created by \"set S_DEAD on unlink()...\" commit\n\n1) i_flags simply doesn\u0027t work for mount/unlink race prevention;\nwe may have many links to file and rm on one of those obviously\nshouldn\u0027t prevent bind on top of another later on. To fix it\nright way we need to mark _dentry_ as unsuitable for mounting\nupon; new flag (DCACHE_CANT_MOUNT) is protected by d_flags and\ni_mutex on the inode in question. Set it (with dont_mount(dentry))\nin unlink/rmdir/etc., check (with cant_mount(dentry)) in places\nin namespace.c that used to check for S_DEAD. Setting S_DEAD\nis still needed in places where we used to set it (for directories\ngetting killed), since we rely on it for readdir/rmdir race\nprevention.\n\n2) rename()/mount() protection has another bogosity - we unhash\nthe target before we\u0027d checked that it\u0027s not a mountpoint. Fixed.\n\n3) ancient bogosity in pivot_root() - we locked i_mutex on the\nright directory, but checked S_DEAD on the different (and wrong)\none. Noticed and fixed.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "bfcf1ae2b2b1c09ee2c420313afe47ac5cc32d3f", "tree": "0f39384efa6cecbdf71fc9bbaffd9054d2369dbd", "parents": [ "ecbb458a484fd9c455f8feb36c87727e71b4ac1a", "98af057092f8f0dabe63c5df08adc2bbfbddb1d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 21:28:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 21:28:42 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes\n ARM: 6125/1: ARM TWD: move TWD registers to common header\n ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled\n ARM: 6112/1: Use the Inner Shareable I-cache and BTB ops on ARMv7 SMP\n ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops\n ARM: 6106/1: Implement copy_to_user_page() for noMMU\n ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c\n" }, { "commit": "ecbb458a484fd9c455f8feb36c87727e71b4ac1a", "tree": "98d5708d66ae4a5673ff64ce7e6e4b71bc1800a5", "parents": [ "16a2164bb03612efe79a76c73da6da44445b9287", "e9b1d5d0ff4d3ae86050dc4c91b3147361c7af9e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 21:28:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 21:28:23 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mrst: Don\u0027t blindly access extended config space\n" }, { "commit": "16a2164bb03612efe79a76c73da6da44445b9287", "tree": "980cb743acfe0a295d3bc70c263abcd20fd6ba80", "parents": [ "bfcc6e2eca507819e297a4c758ebd6b26e625330" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Fri May 14 19:44:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 19:45:06 2010 -0700" }, "message": "profile: fix stats and data leakage\n\nIf the kernel is large or the profiling step small, /proc/profile\nleaks data and readprofile shows silly stats, until readprofile -r\nhas reset the buffer: clear the prof_buffer when it is vmalloc()ed.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bfcc6e2eca507819e297a4c758ebd6b26e625330", "tree": "7fc17a5bcac39cb12b4527797bf985ecf82dbb6c", "parents": [ "ef0e9180d3589ad35eefe9be6b239f32719fd548" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Fri May 14 19:40:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 19:43:41 2010 -0700" }, "message": "hughd: update email address\n\nMy old address will shut down in a couple of weeks: update the tree.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e9b1d5d0ff4d3ae86050dc4c91b3147361c7af9e", "tree": "7b683780c34f3b429e6429b3769591efb6cd2097", "parents": [ "7f284d3cc96e02468a42e045f77af11e5ff8b095" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri May 14 13:55:57 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri May 14 13:55:57 2010 -0700" }, "message": "x86, mrst: Don\u0027t blindly access extended config space\n\nDo not blindly access extended configuration space unless we actively\nknow we\u0027re on a Moorestown platform. The fixed-size BAR capability\nlives in the extended configuration space, and thus is not applicable\nif the configuration space isn\u0027t appropriately sized.\n\nThis fixes booting certain VMware configurations with CONFIG_MRST\u003dy.\n\nMoorestown will add a fake PCI-X 266 capability to advertise the\npresence of extended configuration space.\n\nReported-and-tested-by: Petr Vandrovec \u003cpetr@vandrovec.name\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nAcked-by: Jacob Pan \u003cjacob.jun.pan@intel.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nLKML-Reference: \u003cAANLkTiltKUa3TrKR1M51eGw8FLNoQJSLT0k0_K5X3-OJ@mail.gmail.com\u003e\n" }, { "commit": "ef0e9180d3589ad35eefe9be6b239f32719fd548", "tree": "16faa86808117bbc87f532b06bd727f27442daba", "parents": [ "4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e", "7f284d3cc96e02468a42e045f77af11e5ff8b095" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 12:20:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 12:20:09 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments\n x86, k8: Fix build error when K8_NB is disabled\n x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs\n x86: Fix fake apicid to node mapping for numa emulation\n" }, { "commit": "7f284d3cc96e02468a42e045f77af11e5ff8b095", "tree": "7cb25ec2b39c922d8bffb48953957cc43c94ea90", "parents": [ "ade029e2aaacc8965a548b0b0f80c5bee97ffc68" ], "author": { "name": "Frank Arnold", "email": "frank.arnold@amd.com", "time": "Thu Apr 22 16:06:59 2010 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri May 14 11:53:01 2010 -0700" }, "message": "x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments\n\nWhen running a quest kernel on xen we get:\n\nBUG: unable to handle kernel NULL pointer dereference at 0000000000000038\nIP: [\u003cffffffff8142f2fb\u003e] cpuid4_cache_lookup_regs+0x2ca/0x3df\nPGD 0\nOops: 0000 [#1] SMP\nlast sysfs file:\nCPU 0\nModules linked in:\n\nPid: 0, comm: swapper Tainted: G W 2.6.34-rc3 #1 /HVM domU\nRIP: 0010:[\u003cffffffff8142f2fb\u003e] [\u003cffffffff8142f2fb\u003e] cpuid4_cache_lookup_regs+0x\n2ca/0x3df\nRSP: 0018:ffff880002203e08 EFLAGS: 00010046\nRAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000060\nRDX: 0000000000000000 RSI: 0000000000000040 RDI: 0000000000000000\nRBP: ffff880002203ed8 R08: 00000000000017c0 R09: ffff880002203e38\nR10: ffff8800023d5d40 R11: ffffffff81a01e28 R12: ffff880187e6f5c0\nR13: ffff880002203e34 R14: ffff880002203e58 R15: ffff880002203e68\nFS: 0000000000000000(0000) GS:ffff880002200000(0000) knlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\nCR2: 0000000000000038 CR3: 0000000001a3c000 CR4: 00000000000006f0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess swapper (pid: 0, threadinfo ffffffff81a00000, task ffffffff81a44020)\nStack:\n ffffffff810d7ecb ffff880002203e20 ffffffff81059140 ffff880002203e30\n\u003c0\u003e ffffffff810d7ec9 0000000002203e40 000000000050d140 ffff880002203e70\n\u003c0\u003e 0000000002008140 0000000000000086 ffff880040020140 ffffffff81068b8b\nCall Trace:\n \u003cIRQ\u003e\n [\u003cffffffff810d7ecb\u003e] ? sync_supers_timer_fn+0x0/0x1c\n [\u003cffffffff81059140\u003e] ? mod_timer+0x23/0x25\n [\u003cffffffff810d7ec9\u003e] ? arm_supers_timer+0x34/0x36\n [\u003cffffffff81068b8b\u003e] ? hrtimer_get_next_event+0xa7/0xc3\n [\u003cffffffff81058e85\u003e] ? get_next_timer_interrupt+0x19a/0x20d\n [\u003cffffffff8142fa23\u003e] get_cpu_leaves+0x5c/0x232\n [\u003cffffffff8106a7b1\u003e] ? sched_clock_local+0x1c/0x82\n [\u003cffffffff8106a9a0\u003e] ? sched_clock_tick+0x75/0x7a\n [\u003cffffffff8107748c\u003e] generic_smp_call_function_single_interrupt+0xae/0xd0\n [\u003cffffffff8101f6ef\u003e] smp_call_function_single_interrupt+0x18/0x27\n [\u003cffffffff8100a773\u003e] call_function_single_interrupt+0x13/0x20\n \u003cEOI\u003e\n [\u003cffffffff8143c468\u003e] ? notifier_call_chain+0x14/0x63\n [\u003cffffffff810295c6\u003e] ? native_safe_halt+0xc/0xd\n [\u003cffffffff810114eb\u003e] ? default_idle+0x36/0x53\n [\u003cffffffff81008c22\u003e] cpu_idle+0xaa/0xe4\n [\u003cffffffff81423a9a\u003e] rest_init+0x7e/0x80\n [\u003cffffffff81b10dd2\u003e] start_kernel+0x40e/0x419\n [\u003cffffffff81b102c8\u003e] x86_64_start_reservations+0xb3/0xb7\n [\u003cffffffff81b103c4\u003e] x86_64_start_kernel+0xf8/0x107\nCode: 14 d5 40 ff ae 81 8b 14 02 31 c0 3b 15 47 1c 8b 00 7d 0e 48 8b 05 36 1c 8b\n 00 48 63 d2 48 8b 04 d0 c7 85 5c ff ff ff 00 00 00 00 \u003c8b\u003e 70 38 48 8d 8d 5c ff\n ff ff 48 8b 78 10 ba c4 01 00 00 e8 eb\nRIP [\u003cffffffff8142f2fb\u003e] cpuid4_cache_lookup_regs+0x2ca/0x3df\n RSP \u003cffff880002203e08\u003e\nCR2: 0000000000000038\n---[ end trace a7919e7f17c0a726 ]---\n\nThe L3 cache index disable feature of AMD CPUs has to be disabled if the\nkernel is running as guest on top of a hypervisor because northbridge\ndevices are not available to the guest. Currently, this fixes a boot\ncrash on top of Xen. In the future this will become an issue on KVM as\nwell.\n\nCheck if northbridge devices are present and do not enable the feature\nif there are none.\n\n[ hpa: backported to 2.6.34 ]\n\nSigned-off-by: Frank Arnold \u003cfrank.arnold@amd.com\u003e\nLKML-Reference: \u003c1271945222-5283-3-git-send-email-bp@amd64.org\u003e\nAcked-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: \u003cstable@kernel.org\u003e\n" }, { "commit": "ade029e2aaacc8965a548b0b0f80c5bee97ffc68", "tree": "6b007dcdf36b35a091b8a466648b1104828a94ce", "parents": [ "f01487119dda3d9f58c9729c7361ecc50a61c188" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Sat Apr 24 09:56:53 2010 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri May 14 11:53:01 2010 -0700" }, "message": "x86, k8: Fix build error when K8_NB is disabled\n\nK8_NB depends on PCI and when the last is disabled (allnoconfig) we fail\nat the final linking stage due to missing exported num_k8_northbridges.\nAdd a header stub for that.\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nLKML-Reference: \u003c20100503183036.GJ26107@aftab\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: \u003cstable@kernel.org\u003e\n" }, { "commit": "4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e", "tree": "40a48fe2eabbab01133047ee5055ab8f853deac4", "parents": [ "97b2073ff04814a7f2fef5fe0e82bb008cad7d8e", "b3b38d842fa367d862b83e7670af4e0fd6a80fc0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 11:49:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 11:49:42 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/notify\n\n* \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/notify:\n inotify: don\u0027t leak user struct on inotify release\n inotify: race use after free/double free in inotify inode marks\n inotify: clean up the inotify_add_watch out path\n Inotify: undefined reference to `anon_inode_getfd\u0027\n\nManual merge to remove duplicate \"select ANON_INODES\" from Kconfig file\n" }, { "commit": "97b2073ff04814a7f2fef5fe0e82bb008cad7d8e", "tree": "963db446ed9bdb3d1f8b937e87df7580ce7f2341", "parents": [ "508ff9d41c9aa7e178f6330e703a22af03090dd5", "b9af5ddf8a34ff3c911372173c2e51c6f8a6ca8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 11:43:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 11:43:52 2010 -0700" }, "message": "Merge branch \u0027davinci-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci\n\n* \u0027davinci-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:\n DA830: fix USB 2.0 clock entry\n" }, { "commit": "b9af5ddf8a34ff3c911372173c2e51c6f8a6ca8f", "tree": "006f713f241934420895c4aa33c3647538ed0319", "parents": [ "b57f95a38233a2e73b679bea4a5453a1cc2a1cc9" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Thu May 13 22:51:51 2010 +0400" }, "committer": { "name": "Kevin Hilman", "email": "khilman@deeprootsystems.com", "time": "Fri May 14 11:24:19 2010 -0700" }, "message": "DA830: fix USB 2.0 clock entry\n\nDA8xx OHCI driver fails to load due to failing clk_get() call for the USB 2.0\nclock. Arrange matching USB 2.0 clock by the clock name instead of the device.\n(Adding another CLK() entry for \"ohci.0\" device won\u0027t do -- in the future I\u0027ll\nalso have to enable USB 2.0 clock to configure CPPI 4.1 module, in which case\nI won\u0027t have any device at all.)\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\n" }, { "commit": "b3b38d842fa367d862b83e7670af4e0fd6a80fc0", "tree": "db803231178ae41f21240017a3119dea3a4d3589", "parents": [ "e08733446e72b983fed850fc5d8bd21b386feb29" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@openvz.org", "time": "Wed May 12 15:34:07 2010 -0700" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Fri May 14 11:53:36 2010 -0400" }, "message": "inotify: don\u0027t leak user struct on inotify release\n\ninotify_new_group() receives a get_uid-ed user_struct and saves the\nreference on group-\u003einotify_data.user. The problem is that free_uid() is\nnever called on it.\n\nIssue seem to be introduced by 63c882a0 (inotify: reimplement inotify\nusing fsnotify) after 2.6.30.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nEric Paris \u003ceparis@parisplace.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "e08733446e72b983fed850fc5d8bd21b386feb29", "tree": "6b169001ff9faa82577341fbfa4cbcd9ccf00663", "parents": [ "3dbc6fb6a3c8a7dc164ae330ab024a3fe65ae53e" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue May 11 17:17:40 2010 -0400" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Fri May 14 11:52:57 2010 -0400" }, "message": "inotify: race use after free/double free in inotify inode marks\n\nThere is a race in the inotify add/rm watch code. A task can find and\nremove a mark which doesn\u0027t have all of it\u0027s references. This can\nresult in a use after free/double free situation.\n\nTask A\t\t\t\t\tTask B\n------------\t\t\t\t-----------\ninotify_new_watch()\n allocate a mark (refcnt \u003d\u003d 1)\n add it to the idr\n\t\t\t\t\tinotify_rm_watch()\n\t\t\t\t\t inotify_remove_from_idr()\n\t\t\t\t\t fsnotify_put_mark()\n\t\t\t\t\t refcnt hits 0, free\n take reference because we are on idr\n [at this point it is a use after free]\n [time goes on]\n refcnt may hit 0 again, double free\n\nThe fix is to take the reference BEFORE the object can be found in the\nidr.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nCc: \u003cstable@kernel.org\u003e\n" }, { "commit": "3dbc6fb6a3c8a7dc164ae330ab024a3fe65ae53e", "tree": "b04e140c78e644b18f7aa6ce31d59245dc39f0c0", "parents": [ "e7b702b1a8f2a6961367da903217e669be0f099f" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue May 11 17:16:23 2010 -0400" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Fri May 14 11:51:07 2010 -0400" }, "message": "inotify: clean up the inotify_add_watch out path\n\ninotify_add_watch explictly frees the unused inode mark, but it can just\nuse the generic code. Just do that.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "508ff9d41c9aa7e178f6330e703a22af03090dd5", "tree": "d0098fad8ac34f2f3ee7f162a83ba1ae18edd77f", "parents": [ "3ac4e829bd8575e9adea2ba1b9329da363881ffb", "d77f873fdd21912803836da78f627d2efd267082" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 07:56:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 07:56:45 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n vhost: fix barrier pairing\n" }, { "commit": "3ac4e829bd8575e9adea2ba1b9329da363881ffb", "tree": "1c11ad83f9153db87e1c4d4fb4076e410fb0ae63", "parents": [ "7ac992ef615c66a05ebb831915935e83c0ec8e05", "4ae69e6b718589abe97c9625ccbb1e0bc95a8c0e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 07:55:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 07:55:42 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n mmap_min_addr check CAP_SYS_RAWIO only for write\n" }, { "commit": "7ac992ef615c66a05ebb831915935e83c0ec8e05", "tree": "0bef479fccb4e73733fab628dc525a5959bba925", "parents": [ "6a251b0ab67989f468f4cb65179e0cf40cf8c295", "a5e48b88da225580394f825ffe67e444b050074b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 07:29:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 14 07:29:29 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\n* \u0027for-linus\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n microblaze: Fix module loading on system with WB cache\n microblaze: export assembly functions used by modules\n microblaze: Remove powerpc code from Microblaze port\n microblaze: Remove compilation warnings in cache macro\n microblaze: export assembly functions used by modules\n microblaze: fix get_user/put_user side-effects\n microblaze: re-enable interrupts before calling schedule\n" }, { "commit": "d77f873fdd21912803836da78f627d2efd267082", "tree": "1a3468c7a10b948ac12bac260004eebdfd3e4a60", "parents": [ "cea0d767c29669bf89f86e4aee46ef462d2ebae8", "0d4993563bde70bc7c7718686bc5c5c089733001" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 03:42:49 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 03:42:49 2010 -0700" }, "message": "Merge branch \u0027net-2.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n" }, { "commit": "4ae69e6b718589abe97c9625ccbb1e0bc95a8c0e", "tree": "b669aade412fd2a81af6c9a7c0bcee580c7b31cb", "parents": [ "6a251b0ab67989f468f4cb65179e0cf40cf8c295" ], "author": { "name": "Kees Cook", "email": "kees.cook@canonical.com", "time": "Thu Apr 22 12:19:17 2010 -0700" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 14 19:03:15 2010 +1000" }, "message": "mmap_min_addr check CAP_SYS_RAWIO only for write\n\nRedirecting directly to lsm, here\u0027s the patch discussed on lkml:\nhttp://lkml.org/lkml/2010/4/22/219\n\nThe mmap_min_addr value is useful information for an admin to see without\nbeing root (\"is my system vulnerable to kernel NULL pointer attacks?\") and\nits setting is trivially easy for an attacker to determine by calling\nmmap() in PAGE_SIZE increments starting at 0, so trying to keep it private\nhas no value.\n\nOnly require CAP_SYS_RAWIO if changing the value, not reading it.\n\nComment from Serge :\n\n Me, I like to write my passwords with light blue pen on dark blue\n paper, pasted on my window - if you\u0027re going to get my password, you\u0027re\n gonna get a headache.\n\nSigned-off-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n(cherry picked from commit 822cceec7248013821d655545ea45d1c6a9d15b3)\n" }, { "commit": "a5e48b88da225580394f825ffe67e444b050074b", "tree": "2be84a73c04e0226590a5f3af88efa99fd7471de", "parents": [ "ee4bcdf1d248c4ebe5f73e11631c3bd3f76d777b" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Fri May 14 07:40:46 2010 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Fri May 14 07:43:38 2010 +0200" }, "message": "microblaze: Fix module loading on system with WB cache\n\nThere is necessary to flush whole dcache. Icache work should be\ndone in kernel/module.c.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "f01487119dda3d9f58c9729c7361ecc50a61c188", "tree": "bbd1d01429950207716337fbbd9e9f356560258c", "parents": [ "b0c4d952a158a6a2547672cf4fc9d55e415410de" ], "author": { "name": "Andreas Herrmann", "email": "herrmann.der.user@googlemail.com", "time": "Tue Apr 27 12:13:48 2010 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu May 13 16:21:20 2010 -0700" }, "message": "x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs\n\nIf host CPU is exposed to a guest the OSVW MSRs are not guaranteed\nto be present and a GP fault occurs. Thus checking the feature flag is\nessential.\n\nCc: \u003cstable@kernel.org\u003e # .32.x .33.x\nSigned-off-by: Andreas Herrmann \u003candreas.herrmann3@amd.com\u003e\nLKML-Reference: \u003c20100427101348.GC4489@alberich.amd.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "6a251b0ab67989f468f4cb65179e0cf40cf8c295", "tree": "f0e857619ca27e552fd0e9e929d428ab5faefd8b", "parents": [ "9e766d81b1f432826fd773fc5d679b8a8095e941", "5051d411ec87381693433d24c4488b2fa4a6306c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 14:48:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 14:48:10 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Clean up after WM83xx AUXADC interrupt if it arrives late\n" }, { "commit": "9e766d81b1f432826fd773fc5d679b8a8095e941", "tree": "c61e6035d460188e72ecde235ce5d34d9a475950", "parents": [ "bf6239eb84e6d7331f168cd3593958b656ce42a3", "4f018c513a81ba243165bfc4fcf44254986ad002" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 14:36:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 14:36:19 2010 -0700" }, "message": "Merge branch \u0027kvm-updates/2.6.34\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.34\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe()\n KVM: VMX: blocked-by-sti must not defer NMI injections\n KVM: x86: Call vcpu_load and vcpu_put in cpuid_update\n KVM: SVM: Fix wrong intercept masks on 32 bit\n KVM: convert ioapic lock to spinlock\n" }, { "commit": "bf6239eb84e6d7331f168cd3593958b656ce42a3", "tree": "9f123cdc8f4616dadec022fb3c03222feab2a9a9", "parents": [ "4462dc02842698f173f518c1f5ce79c0fb89395a", "1c5250d6163dac28be3afabdfb6c723f107051b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 12:21:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 12:21:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: imx.c: fix CTS trigger level lower to avoid lost chars\n tty: Fix unbalanced BKL handling in error path\n serial: mpc52xx_uart: fix null pointer dereference\n" }, { "commit": "1c5250d6163dac28be3afabdfb6c723f107051b7", "tree": "efb40da1a3267af59c279ae014414daecacb90bb", "parents": [ "77945febbe60a69e9dcab7f49d33a1aa1e436973" ], "author": { "name": "Valentin Longchamp", "email": "valentin.longchamp@epfl.ch", "time": "Wed May 05 11:47:07 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 13 12:10:56 2010 -0700" }, "message": "serial: imx.c: fix CTS trigger level lower to avoid lost chars\n\nThe imx CTS trigger level is left at its reset value that is 32\nchars. Since the RX FIFO has 32 entries, when CTS is raised, the\nFIFO already is full. However, some serial port devices first empty\ntheir TX FIFO before stopping when CTS is raised, resulting in lost\nchars.\n\nThis patch sets the trigger level lower so that other chars arrive\nafter CTS is raised, there is still room for 16 of them.\n\nSigned-off-by: Valentin Longchamp\u003cvalentin.longchamp@epfl.ch\u003e\nTested-by: Philippe Rétornaz\u003cphilippe.retornaz@epfl.ch\u003e\nAcked-by: Wolfram Sang\u003cw.sang@pengutronix.de\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "77945febbe60a69e9dcab7f49d33a1aa1e436973", "tree": "1475c6c8215e831904e78a08d1947ffb5a1516ce", "parents": [ "e6114fa1d1d6a588766f28081b971047dd3e5def" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue May 04 20:42:36 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 13 12:10:56 2010 -0700" }, "message": "tty: Fix unbalanced BKL handling in error path\n\nArnd noted:\n\nAfter the \"retry_open:\" label, we first get the tty_mutex\nand then the BKL. However a the end of tty_open, we jump\nback to retry_open with the BKL still held. If we run into\nthis case, the tty_open function will be left with the BKL\nstill held.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e6114fa1d1d6a588766f28081b971047dd3e5def", "tree": "58abc158d7f3ad52e5071b77c34be6d752848319", "parents": [ "cea0d767c29669bf89f86e4aee46ef462d2ebae8" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Wed May 05 00:18:59 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 13 12:10:55 2010 -0700" }, "message": "serial: mpc52xx_uart: fix null pointer dereference\n\nCommit 6acc6833510db8f72b5ef343296d97480555fda9\nintroduced NULL pointer dereference and kernel crash\non ppc32 machines while booting. Fix this bug now.\n\nReported-by: Leonardo Chiquitto \u003cleonardo.lists@gmail.com\u003e\nTested-by: Leonardo Chiquitto \u003cleonardo.lists@gmail.com\u003e\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4462dc02842698f173f518c1f5ce79c0fb89395a", "tree": "efef7ddcacfd5e119f2ff98e7eb970862d392b6d", "parents": [ "002baeecf53677d2034113e34197ec221f42e037", "3d69438031b00c601c991ab447cafb7d5c3c59a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 10:36:16 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 10:36:16 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:\n cifs: guard against hardlinking directories\n" }, { "commit": "002baeecf53677d2034113e34197ec221f42e037", "tree": "081c54c4a9a266a894a00165e97dabfb212a2470", "parents": [ "fc8e38f142dd59f81306ff6a81c1351e9eb0e014" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 13 12:52:57 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 08:46:04 2010 -0700" }, "message": "vfs: Fix O_NOFOLLOW behavior for paths with trailing slashes\n\nAccording to specification\n\n\tmkdir d; ln -s d a; open(\"a/\", O_NOFOLLOW | O_RDONLY)\n\nshould return success but currently it returns ELOOP. This is a\nregression caused by path lookup cleanup patch series.\n\nFix the code to ignore O_NOFOLLOW in case the provided path has trailing\nslashes.\n\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nReported-by: Marius Tolzmann \u003ctolzmann@molgen.mpg.de\u003e\nAcked-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc8e38f142dd59f81306ff6a81c1351e9eb0e014", "tree": "5f2fc612bdde9cbe264b544af2e3e0a429345ef6", "parents": [ "aa86f26bd81a46985f1b32e513638d1c36cf3104", "105ce39ca4fabf20e3211cae1abc8f037e6a1f7f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 07:35:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 07:35:26 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: ice1724 - Fix ESI Maya44 capture source control\n ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs\n ALSA: virtuoso: fix Xonar D1/DX front panel microphone\n ALSA: hda - Add hp-dv4 model for IDT 92HD71bx\n ALSA: hda - Fix mute-LED GPIO pin for HP dv series\n ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice)\n" }, { "commit": "aa86f26bd81a46985f1b32e513638d1c36cf3104", "tree": "86a3e978f511536ba2a12740b58392f3d3e13e11", "parents": [ "be835674b55324c1abe973b15343c3663910c620", "3843384a055496dfed3c93ae883d964d8290fdab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 07:28:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 13 07:28:43 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: ad7877 - keep dma rx buffers in seperate cache lines\n Input: psmouse - reset all types of mice before reconnecting\n Input: elantech - use all 3 bytes when checking version\n Input: iforce - fix Guillemot Jet Leader 3D entry\n Input: iforce - add Guillemot Jet Leader Force Feedback\n" }, { "commit": "5051d411ec87381693433d24c4488b2fa4a6306c", "tree": "82ddb281a3bb02163af1041db8e1769274ba9814", "parents": [ "be835674b55324c1abe973b15343c3663910c620" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Apr 02 13:08:39 2010 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu May 13 12:58:55 2010 +0200" }, "message": "mfd: Clean up after WM83xx AUXADC interrupt if it arrives late\n\nIn certain circumstances, especially under heavy load, the AUXADC\ncompletion interrupt may be detected after we\u0027ve timed out waiting for\nit. That conversion would still succeed but the next conversion will\nsee the completion that was signalled by the interrupt for the previous\nconversion and therefore not wait for the AUXADC conversion to run,\ncausing it to report failure.\n\nProvide a simple, non-invasive cleanup by using try_wait_for_completion()\nto ensure that the completion is not signalled before we wait. Since\nthe AUXADC is run within a mutex we know there can only have been at\nmost one AUXADC interrupt outstanding. A more involved change should\nfollow for the next merge window.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ee4bcdf1d248c4ebe5f73e11631c3bd3f76d777b", "tree": "3dd2ae05fbf33960e5ed2b725e5ebe0bcbe3ed60", "parents": [ "1ce2470aa544a0aa37b575c45cba366770860af7" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 12:11:42 2010 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 12:11:42 2010 +0200" }, "message": "microblaze: export assembly functions used by modules\n\nExport __strncpy_user, memory_size, ioremap_bot for modules.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "1ce2470aa544a0aa37b575c45cba366770860af7", "tree": "b9b96d57efa7f21a9168c311f8e197465753c662", "parents": [ "ddfbc935eae68294834dc29998f93147a5422a0d" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 12:09:54 2010 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 12:09:54 2010 +0200" }, "message": "microblaze: Remove powerpc code from Microblaze port\n\nRemove eeh_add_device_tree_late which is powerpc specific code.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "ddfbc935eae68294834dc29998f93147a5422a0d", "tree": "1712d1923128233edd6d7117d843cee40be3d287", "parents": [ "e1733d2c397476c245a681ba0b54c88858b7a0be" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 10:55:47 2010 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 10:55:47 2010 +0200" }, "message": "microblaze: Remove compilation warnings in cache macro\n\nCC arch/microblaze/kernel/cpu/cache.o\narch/microblaze/kernel/cpu/cache.c: In function \u0027__invalidate_dcache_range_wb\u0027:\narch/microblaze/kernel/cpu/cache.c:398: warning: ISO C90 forbids mixed declarations and code\narch/microblaze/kernel/cpu/cache.c: In function \u0027__flush_dcache_range_wb\u0027:\narch/microblaze/kernel/cpu/cache.c:509: warning: ISO C90 forbids mixed declara\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "e1733d2c397476c245a681ba0b54c88858b7a0be", "tree": "400a1035774b8266cb303a0b5246c2a9551bd282", "parents": [ "538722ca3b762023ac65cec214901a1ebff8b575" ], "author": { "name": "Steven J. Magnani", "email": "steve@digidescorp.com", "time": "Tue Apr 27 13:00:35 2010 -0500" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 10:46:04 2010 +0200" }, "message": "microblaze: export assembly functions used by modules\n\nModules that use copy_{to,from}_user(), memcpy(), and memset() fail to build\nin certain circumstances.\n\nSigned-off-by: Steven J. Magnani \u003csteve@digidescorp.com\u003e\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "105ce39ca4fabf20e3211cae1abc8f037e6a1f7f", "tree": "34769f80d1eadae93459b8a26fe60302df5e9042", "parents": [ "8213466596bf10b75887754773ee13c10cf86f5c", "2a6ce6e5fda4721b35f309acedf4cac61ecbfb04" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu May 13 10:07:15 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu May 13 10:07:15 2010 +0200" }, "message": "Merge branch \u0027fix/hda\u0027 into for-linus\n" }, { "commit": "3843384a055496dfed3c93ae883d964d8290fdab", "tree": "e60dfe169cd2a6bf83c7cb6d362c39a336b3798e", "parents": [ "ef110b24e28f36620f63dab94708a17c7e267358" ], "author": { "name": "Oskar Schirmer", "email": "os@emlix.com", "time": "Thu May 13 00:42:23 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 13 00:43:32 2010 -0700" }, "message": "Input: ad7877 - keep dma rx buffers in seperate cache lines\n\nWith dma based spi transmission, data corruption is observed\noccasionally. With dma buffers located right next to msg and\nxfer fields, cache lines correctly flushed in preparation for\ndma usage may be polluted again when writing to fields in the\nsame cache line.\n\nMake sure cache fields used with dma do not share cache lines\nwith fields changed during dma handling. As both fields are part\nof a struct that is allocated via kzalloc, thus cache aligned,\nmoving the fields to the 1st position and insert padding for\nalignment does the job.\n\nSigned-off-by: Oskar Schirmer \u003cos@emlix.com\u003e\nSigned-off-by: Daniel Glöckner \u003cdg@emlix.com\u003e\nSigned-off-by: Oliver Schneidewind \u003cosw@emlix.com\u003e\nSigned-off-by: Johannes Weiner \u003cjw@emlix.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n[dtor@mail.ru - changed to use ___cacheline_aligned as suggested\n by akpm]\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "ef110b24e28f36620f63dab94708a17c7e267358", "tree": "0b194aa3d7069983de14d821c3a044557008ce9d", "parents": [ "504e8beed161bd11a2c6cbb8aaf352c14d39b5bb" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 13 00:42:23 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 13 00:43:26 2010 -0700" }, "message": "Input: psmouse - reset all types of mice before reconnecting\n\nSynaptics hardware requires resetting device after suspend to ram\nin order for the device to be operational. The reset lives in\nsynaptics-specific reconnect handler, but it is not being invoked\nif synaptics support is disabled and the device is handled as a\nstandard PS/2 device (bare or IntelliMouse protocol).\n\nLet\u0027s add reset into generic reconnect handler as well.\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "504e8beed161bd11a2c6cbb8aaf352c14d39b5bb", "tree": "e9fa1e22d917fafc4a8ec005934f4b19f2d834ac", "parents": [ "513d8be9883fe0a7a73d216c7cecd20e7c9effda" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 13 00:41:15 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 13 00:43:19 2010 -0700" }, "message": "Input: elantech - use all 3 bytes when checking version\n\nApparently all 3 bytes returned by ETP_FW_VERSION_QUERY are significant\nand should be taken into account when matching hardware version/features.\n\nTested-by: Eric Piel \u003ceric.piel@tremplin-utc.net\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "538722ca3b762023ac65cec214901a1ebff8b575", "tree": "5d4ca0048a9351744fcfa6b5ca2cc25e090882f6", "parents": [ "0d5961b7f612f8f54fd6fbe1942cdfb141cddfb9" ], "author": { "name": "Steven J. Magnani", "email": "steve@digidescorp.com", "time": "Thu May 06 16:38:33 2010 -0500" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 09:21:14 2010 +0200" }, "message": "microblaze: fix get_user/put_user side-effects\n\nThe Microblaze implementations of get_user() and (MMU) put_user() evaluate\nthe address argument more than once. This causes unexpected side-effects for\ninvocations that include increment operators, i.e. get_user(foo, bar++).\n\nThis patch also removes the distinction between MMU and noMMU put_user().\n\nWithout the patch:\n $ echo 1234567890 \u003e /proc/sys/kernel/core_pattern\n $ cat /proc/sys/kernel/core_pattern\n 12345\n\nSigned-off-by: Steven J. Magnani \u003csteve@digidescorp.com\u003e\n" }, { "commit": "0d5961b7f612f8f54fd6fbe1942cdfb141cddfb9", "tree": "3e4e29715f7c49a0ebfbd76ccf72f675a4bb979f", "parents": [ "be835674b55324c1abe973b15343c3663910c620" ], "author": { "name": "Steven J. Magnani", "email": "steve@digidescorp.com", "time": "Tue Apr 27 13:00:23 2010 -0500" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu May 13 09:21:01 2010 +0200" }, "message": "microblaze: re-enable interrupts before calling schedule\n\nschedule() should not be called with interrupts disabled.\n\nSigned-off-by: Steven J. Magnani \u003csteve@digidescorp.com\u003e\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "46db2c3205ca6e24adbb9b038441bc8f65360535", "tree": "28a70cdb69e82795b699d3184f51faf7903d1088", "parents": [ "829e92458532b1dbfeb972435d45bb060cdbf5a3" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Tue Mar 30 18:27:39 2010 -0300" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 13 07:55:29 2010 +0200" }, "message": "perf record: Add a fallback to the reference relocation symbol\n\nUsually \"_text\" is enough, but I received reports that its not always\navailable, so fallback to \"_stext\" for the symbol we use to check if we\nneed to apply any relocation to all the symbols in the kernel symtab,\nfor when, for instance, kexec is being used.\n\nReported-by: Darren Hart \u003cdvhltc@us.ibm.com\u003e\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frédéric Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4f018c513a81ba243165bfc4fcf44254986ad002", "tree": "95b94a1676b6b7314274576dbea0b863c73e3aba", "parents": [ "f8c5fae16649445e15656667f72bd51d777f7766" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Sun May 09 17:26:47 2010 +0200" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu May 13 01:33:04 2010 -0300" }, "message": "KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe()\n\nAn index of KVM44x_GUEST_TLB_SIZE is already one too large.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Hollis Blanchard \u003chollis@penguinppc.org\u003e\nAcked-by: Alexander Graf \u003cagraf@suse.de\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "f8c5fae16649445e15656667f72bd51d777f7766", "tree": "c4744f5024da012bbe9658dc4e80601fb3197281", "parents": [ "fe19c5a46b4c519153fddd4d5efe32a3e4cfa694" ], "author": { "name": "Jan Kiszka", "email": "jan.kiszka@siemens.com", "time": "Tue May 11 15:16:46 2010 +0200" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu May 13 01:31:37 2010 -0300" }, "message": "KVM: VMX: blocked-by-sti must not defer NMI injections\n\nAs the processor may not consider GUEST_INTR_STATE_STI as a reason for\nblocking NMI, it could return immediately with EXIT_REASON_NMI_WINDOW\nwhen we asked for it. But as we consider this state as NMI-blocking, we\ncan run into an endless loop.\n\nResolve this by allowing NMI injection if just GUEST_INTR_STATE_STI is\nactive (originally suggested by Gleb). Intel confirmed that this is\nsafe, the processor will never complain about NMI injection in this\nstate.\n\nSigned-off-by: Jan Kiszka \u003cjan.kiszka@siemens.com\u003e\nKVM-Stable-Tag\nAcked-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "fe19c5a46b4c519153fddd4d5efe32a3e4cfa694", "tree": "d06ee3d4bdd4a8bf7953841608b0ad32e7a4f5bd", "parents": [ "061e2fd16863009c8005b4b5fdfb75c7215c0b99" ], "author": { "name": "Dongxiao Xu", "email": "dongxiao.xu@intel.com", "time": "Tue May 11 18:21:33 2010 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu May 13 01:31:02 2010 -0300" }, "message": "KVM: x86: Call vcpu_load and vcpu_put in cpuid_update\n\ncpuid_update may operate VMCS, so vcpu_load() and vcpu_put()\nshould be called to ensure correctness.\n\nSigned-off-by: Dongxiao Xu \u003cdongxiao.xu@intel.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "061e2fd16863009c8005b4b5fdfb75c7215c0b99", "tree": "54173bdbc5e490bbba23b30286b2c88d00131407", "parents": [ "46a47b1ed118cda1a08b7f6077b837a00fbc112b" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Wed May 05 16:04:43 2010 +0200" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu May 13 01:24:08 2010 -0300" }, "message": "KVM: SVM: Fix wrong intercept masks on 32 bit\n\nThis patch makes KVM on 32 bit SVM working again by\ncorrecting the masks used for iret interception. With the\nwrong masks the upper 32 bits of the intercepts are masked\nout which leaves vmrun unintercepted. This is not legal on\nsvm and the vmrun fails.\nBug was introduced by commits 95ba827313 and 3cfc3092.\n\nCc: Jan Kiszka \u003cjan.kiszka@siemens.com\u003e\nCc: Gleb Natapov \u003cgleb@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "46a47b1ed118cda1a08b7f6077b837a00fbc112b", "tree": "d86686ebd47f9e5751b91121926ddbf6917e39a6", "parents": [ "be835674b55324c1abe973b15343c3663910c620" ], "author": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Fri Apr 23 14:03:38 2010 -0300" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu May 13 01:23:55 2010 -0300" }, "message": "KVM: convert ioapic lock to spinlock\n\nkvm_set_irq is used from non sleepable contexes, so convert ioapic from\nmutex to spinlock.\n\nKVM-Stable-Tag.\nTested-by: Ralf Bonenkamp \u003cralf.bonenkamp@swyx.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "be835674b55324c1abe973b15343c3663910c620", "tree": "481604c6b68bc5c37e9674e72ea3f967ee609b1b", "parents": [ "5ec390e046039942d59ef2634b967b8b23fc57c2", "131c6c9eddfa252e376edb4aeff9c7fe1b96a798" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:48:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:48:26 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/perf_event: Fix oops due to perf_event_do_pending call\n powerpc/swiotlb: Fix off by one in determining boundary of which ops to use\n" }, { "commit": "5ec390e046039942d59ef2634b967b8b23fc57c2", "tree": "c1d80246ec80ef60335f7bbcc6f5c22db901edcb", "parents": [ "cdf5f61ed1d64d50eb9cf10071ab40836f5f9f91", "57d84906f0f3005d4d22e13a3f5102a16a7fc4a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:47:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:47:55 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] correct address of _stext with CONFIG_SHARED_KERNEL\u003dy\n [S390] ptrace: fix return value of do_syscall_trace_enter()\n [S390] dasd: fix race between tasklet and dasd_sleep_on\n" }, { "commit": "cdf5f61ed1d64d50eb9cf10071ab40836f5f9f91", "tree": "d67166525b89055b44ecf52cd9ae395a676877f5", "parents": [ "769d9968e42c995eaaf61ac5583d998f32e0769a", "e84346b726ea90a8ed470bc81c4136a7b8710ea5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:47:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:47:29 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: preserve seq # on requeued messages after transient transport errors\n ceph: fix cap removal races\n ceph: zero unused message header, footer fields\n ceph: fix locking for waking session requests after reconnect\n ceph: resubmit requests on pg mapping change (not just primary change)\n ceph: fix open file counting on snapped inodes when mds returns no caps\n ceph: unregister osd request on failure\n ceph: don\u0027t use writeback_control in writepages completion\n ceph: unregister bdi before kill_anon_super releases device name\n" }, { "commit": "131c6c9eddfa252e376edb4aeff9c7fe1b96a798", "tree": "4eb6909139decb6330f55cf6c53a554a6c22641f", "parents": [ "0fe1ac48bef018bed896307cd12f6ca9b5e704ab", "b8b14c66765ccba884c5c4570bf8be361d211d95" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu May 13 11:42:40 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu May 13 11:42:40 2010 +1000" }, "message": "Merge commit \u0027kumar/merge\u0027 into merge\n" }, { "commit": "769d9968e42c995eaaf61ac5583d998f32e0769a", "tree": "e777fd34d8772fe3a89491f6669161c66c78a2cf", "parents": [ "7ac512aa8237c43331ffaf77a4fd8b8d684819ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:39:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:39:45 2010 -0700" }, "message": "Revert \"PCI: update bridge resources to get more big ranges in PCI assign unssigned\"\n\nThis reverts commit 977d17bb1749517b353874ccdc9b85abc7a58c2a, because it\ncan cause problems with some devices not getting any resources at all\nwhen the resource tree is re-allocated.\n\nFor an example of this, see\n\n\thttps://bugzilla.kernel.org/show_bug.cgi?id\u003d15960\n\t(originally https://bugtrack.alsa-project.org/alsa-bug/view.php?id\u003d4982)\n\t(lkml thread: http://lkml.org/lkml/2010/4/19/20)\n\nwhere Peter Henriksson reported his Xonar DX sound card gone, because\nthe IO port region was no longer allocated.\n\nReported-bisected-and-tested-by: Peter Henriksson \u003cpeter.henriksson@gmail.com\u003e\nRequested-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nRequested-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7ac512aa8237c43331ffaf77a4fd8b8d684819ba", "tree": "0fe199f0364c5b54012691c9e4ff4a11767d1797", "parents": [ "91af70814105f4c05e6e11b51c3269907b71794b" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed May 12 15:34:03 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:23:58 2010 -0700" }, "message": "CacheFiles: Fix error handling in cachefiles_determine_cache_security()\n\ncachefiles_determine_cache_security() is expected to return with a\nsecurity override in place. However, if set_create_files_as() fails, we\nfail to do this. In this case, we should just reinstate the security\noverride that was set by the caller.\n\nFurthermore, if set_create_files_as() fails, we should dispose of the\nnew credentials we were in the process of creating.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "91af70814105f4c05e6e11b51c3269907b71794b", "tree": "3857e57d3bccc1638ce2dc0413249cc2f3469d34", "parents": [ "cea0d767c29669bf89f86e4aee46ef462d2ebae8" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Wed May 12 11:38:45 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 12 18:23:34 2010 -0700" }, "message": "rwsem: Test for no active locks in __rwsem_do_wake undo code\n\nIf there are no active threasd using a semaphore, it is always correct\nto unqueue blocked threads. This seems to be what was intended in the\nundo code.\n\nWhat was done instead, was to look for a sem count of zero - this is an\nimpossible situation, given that at least one thread is known to be\nqueued on the semaphore. The code might be correct as written, but it\u0027s\nhard to reason about and it\u0027s not what was intended (otherwise the goto\nout would have been unconditional).\n\nGo for checking the active count - the alternative is not worth the\nheadache.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d4993563bde70bc7c7718686bc5c5c089733001", "tree": "c436326c77afc9cd1c9e0315e313d6ba2502c160", "parents": [ "de02d72bb3cc5b3d4c873db4ca8291723dd48479" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Tue May 11 19:44:17 2010 +0300" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Wed May 12 18:04:04 2010 +0300" }, "message": "vhost: fix barrier pairing\n\nAccording to memory-barriers.txt, an smp memory barrier in guest\nshould always be paired with an smp memory barrier in host,\nand I quote \"a lack of appropriate pairing is almost certainly an\nerror\". In case of vhost, failure to flush out used index\nupdate before looking at the interrupt disable flag\ncould result in missed interrupts, resulting in\nnetworking hang under stress.\n\nThis might happen when flags read bypasses used index write.\nSo we see interrupts disabled and do not interrupt, at the\nsame time guest writes flags value to enable interrupt,\nreads an old used index value, thinks that\nused ring is empty and waits for interrupt.\n\nNote: the barrier we pair with here is in\ndrivers/virtio/virtio_ring.c, function\nvring_enable_cb.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Juan Quintela \u003cquintela@redhat.com\u003e\n" }, { "commit": "e7b702b1a8f2a6961367da903217e669be0f099f", "tree": "bd2a49f1fec1035256fe90e120fe878fdfa2ac12", "parents": [ "cea0d767c29669bf89f86e4aee46ef462d2ebae8" ], "author": { "name": "Russell King", "email": "rmk@arm.linux.org.uk", "time": "Sun Apr 18 21:25:11 2010 +0100" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Wed May 12 11:03:40 2010 -0400" }, "message": "Inotify: undefined reference to `anon_inode_getfd\u0027\n\nFix:\n\nfs/built-in.o: In function `sys_inotify_init1\u0027:\nsummary.c:(.text+0x347a4): undefined reference to `anon_inode_getfd\u0027\n\nfound by kautobuild with arms bcmring_defconfig, which ends up with\nINOTIFY_USER enabled (through the \u0027default y\u0027) but leaves ANON_INODES\nunset. However, inotify_user.c uses anon_inode_getfd().\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "8213466596bf10b75887754773ee13c10cf86f5c", "tree": "b52ab03e9d1812ab069989a48c76636293a1387c", "parents": [ "9fe17b5d47d3d3c85b35623dea8f571a184134c0" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed May 12 16:43:32 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed May 12 16:43:32 2010 +0200" }, "message": "ALSA: ice1724 - Fix ESI Maya44 capture source control\n\nThe capture source control of maya44 was wrongly coded with the bit\nshift instead of the bit mask. Also, the slot for line-in was\nwrongly assigned (slot 5 instead of 4).\n\nReported-by: Alex Chernyshoff \u003calexdsp@gmail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "98af057092f8f0dabe63c5df08adc2bbfbddb1d2", "tree": "e67a50fcceb973cbaa0457aa131d905acbbe96d4", "parents": [ "f4a27aed48584b9e4699e9ee76288618a8574d77" ], "author": { "name": "Srinidhi Kasagar", "email": "srinidhi.kasagar@stericsson.com", "time": "Wed May 12 05:53:26 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 12 11:18:14 2010 +0100" }, "message": "ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes\n\nThis fixes the build failures seen when building mpcore_wdt and it\nalso removes the nonexistent ARM_MPCORE_PLATFORM dependency, instead\nmake it dependent on HAVE_ARM_TWD.\n\nAlso this fixes spinlock usage appropriately.\n\nSigned-off-by: srinidhi kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f4a27aed48584b9e4699e9ee76288618a8574d77", "tree": "3620c7c02872aafabd50ccc82e7681919a8c5648", "parents": [ "e814d826dc1821dbce3aa1ddb7f2f739f420ffd8" ], "author": { "name": "Srinidhi Kasagar", "email": "srinidhi.kasagar@stericsson.com", "time": "Wed May 12 05:52:18 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 12 11:18:13 2010 +0100" }, "message": "ARM: 6125/1: ARM TWD: move TWD registers to common header\n\nThis moves the TWD register set of MPcore to a common\nexisting file so that watchdog driver can access it\n\nSigned-off-by: srinidhi kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9fe17b5d47d3d3c85b35623dea8f571a184134c0", "tree": "c2cb92b7f898a68b8cbb3adb8deee265b1f06684", "parents": [ "6a45f7822544c54a2cf070d84f4e85f2fb32ec02" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed May 12 10:32:42 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed May 12 10:32:42 2010 +0200" }, "message": "ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs\n\nMIPS non-coherent archs need the noncached pgprot in mmap of PCM buffers.\nBut, since the coherency needs to be checked dynamically via\nplat_device_is_coherent(), we need an ugly check dependent on MIPS\nin ALSA core code.\n\nThis should be cleaned up in MIPS arch side (e.g. creating\ndma_mmap_coherent()) in near future.\n\nTested-by: Wu Zhangjin \u003cwuzhangjin@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" } ], "next": "6a45f7822544c54a2cf070d84f4e85f2fb32ec02" }