)]}' { "log": [ { "commit": "be405411f712489f2f780ab085e1069e8fb85f19", "tree": "39816de2c022f940cfeb6bd3218f9346b91f31f7", "parents": [ "93c3d65b28bab6da520c2add9cb387a0303f8b2d" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Tue Jan 17 22:07:30 2012 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:50:17 2012 -0800" }, "message": "tpm: fix (ACPI S3) suspend regression\n\nThis patch fixes an (ACPI S3) suspend regression introduced in commit\n68d6e6713fcb (\"tpm: Introduce function to poll for result of self test\")\nand occurring with an Infineon TPM and tpm_tis and tpm_infineon drivers\nactive.\n\nThe suspend problem occurred if the TPM was disabled and/or deactivated\nand therefore the TPM_PCRRead checking the result of the (asynchronous)\nself test returned an error code which then caused the tpm_tis driver to\nbecome inactive and this then seemed to have negatively influenced the\nsuspend support by the tpm_infineon driver... Besides that the tpm_tis\ndrive may stay active even if the TPM is disabled and/or deactivated.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90ab5ee94171b3e28de6bb42ee30b527014e0be7", "tree": "fcf89889f6e881f2b231d3d20287c08174ce4b54", "parents": [ "476bc0015bf09dad39d36a8b19f76f0c181d1ec9" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "message": "module_param: make bool parameters really bool (drivers \u0026 misc)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "8077e8b059232f23fe51fdc42868dcd8ba293549", "tree": "86eea03f30cd64a3da57245a61d5a3a04fdb2308", "parents": [ "7845bc3964756240863ae453ffe4f7ee27ddc954", "b9e3238aa36db33aa0d0bd44ef85297c45627aac" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Nov 17 10:08:37 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Nov 17 10:08:37 2011 +1100" }, "message": "Merge branch \u0027for-james\u0027 of git://github.com/srajiv/tpm into next\n" }, { "commit": "b9e3238aa36db33aa0d0bd44ef85297c45627aac", "tree": "5c9d90539b5730df66d8dfa26f025b2be898a006", "parents": [ "2f592f2a7d74c66763a6903edd04109132674d73" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Nov 01 17:00:52 2011 -0200" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:57:11 2011 -0200" }, "message": "TPM: fix transmit_cmd error logic\n\nIt\u0027s incorrect to assume that buffers returned by the TPM\n10 bytes long are always error reports. This patches\nparses the error field in its header instead. The error report\nis now being printed using dev_err() instead of dev_dbg(), making\nit easier for users to provide more detailed bug reports.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "2f592f2a7d74c66763a6903edd04109132674d73", "tree": "b7415d683708891d29f0cca252c96230300934d4", "parents": [ "fd04886660208ab2e35baaca55588afa57d52c9c" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Nov 01 09:42:58 2011 -0200" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:45:07 2011 -0200" }, "message": "TPM: NSC and TIS drivers X86 dependency fix\n\nA previous commit removed its PNP dependency, that in fact wasn\u0027t\nnecessary, but also allowed it be built for other architectures not\nsupported by it. This then caused kernel oops on PPC based machines.\nI\u0027m placing a x86 dependency back correctly.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "fd04886660208ab2e35baaca55588afa57d52c9c", "tree": "200fd2b5a472317472f36cd452f60b1e5b42874f", "parents": [ "9efa54f002cc03fdb4e9d8d508aa996af01c48d0" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Fri Sep 16 14:39:40 2011 -0300" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:44:55 2011 -0200" }, "message": "TPM: Export wait_for_stat for other vendor specific drivers\n\nMoved wait_for_stat to tpm.c so that other drivers can use it.\nAlso renamed it to avoid future namespace conflicts.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "9efa54f002cc03fdb4e9d8d508aa996af01c48d0", "tree": "439ffe314d78264c15b58bb1f9202b09243c8659", "parents": [ "a927b8131794ee449b7f6666e7ab61301949b20f" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Fri Sep 16 14:34:37 2011 -0300" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:43:50 2011 -0200" }, "message": "TPM: Use vendor specific function for status probe\n\nMoved from using tpm_tis_status() to the vendor specific\none in wait_for_stat(). This way other TPM drivers can use it\ninstead of reimplementing another.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "a927b8131794ee449b7f6666e7ab61301949b20f", "tree": "05f341ab38243087faff74d0e56ecc6e880bd490", "parents": [ "7f326ed7ff221a109bf89288bf6c8f0142e3e75c" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Nov 11 12:57:06 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:43:03 2011 -0200" }, "message": "tpm_tis: add delay after aborting command\n\nThis patch adds a delay after aborting a command. Some TPMs need\nthis and will not process the subsequent command correctly otherwise.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\n" }, { "commit": "7f326ed7ff221a109bf89288bf6c8f0142e3e75c", "tree": "89e3901917831a53cd3e8c805c9984e9ba5a5f60", "parents": [ "68d6e6713fcb2ea6278661aaaf5f1c9c821b3751" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Nov 11 12:57:05 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:43:01 2011 -0200" }, "message": "tpm_tis: Check return code from getting timeouts/durations\n\nCheck the return code from getting the TPM\u0027s timeouts and durations\nand reject the driver if they could not be read.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\n" }, { "commit": "68d6e6713fcb2ea6278661aaaf5f1c9c821b3751", "tree": "fb02641cb1941a6d9c23ac3df37d6aafcd4f7f3a", "parents": [ "d97c6ade5926afb6d52df36c33a3491d62cd0dc0" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Nov 11 12:57:04 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:42:59 2011 -0200" }, "message": "tpm: Introduce function to poll for result of self test\n\nThis patch introduces a function that runs the TPM_ContinueSelfTest()\nfunction and then polls the TPM to check whether it finished the selftest\nand can receive new commands.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\n" }, { "commit": "d97c6ade5926afb6d52df36c33a3491d62cd0dc0", "tree": "128f8b39c5d976149f6eb167ea8b03b59d3b40d8", "parents": [ "2b30a90f6c358714b9d6e628ac92e514917f93a1" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Nov 11 12:57:03 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:42:57 2011 -0200" }, "message": "tpm: Cleanup tpm_continue_selftest\n\nCleanup the tpm_continue_selftest function.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\n" }, { "commit": "2b30a90f6c358714b9d6e628ac92e514917f93a1", "tree": "d5fee00222aea732edd6760eb5fe78675e5dc2e2", "parents": [ "e163bc8e4a0cd1cdffadb58253f7651201722d56" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Nov 11 12:57:02 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Nov 16 09:42:54 2011 -0200" }, "message": "tpm: Have tpm_get_timeouts return an error code\n\nHave the tpm_get_timeouts function return an error code.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\n" }, { "commit": "36b8d186e6cc8e32cb5227f5645a58e1bc0af190", "tree": "1000ad26e189e6ff2c53fb7eeff605f59c7ad94e", "parents": [ "cd85b557414fe4cd44ea6608825e96612a5fe2b2", "c45ed235abf1b0b6666417e3c394f18717976acd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:45:31 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:45:31 2011 +0200" }, "message": "Merge branch \u0027next\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027next\u0027 of git://selinuxproject.org/~jmorris/linux-security: (95 commits)\n TOMOYO: Fix incomplete read after seek.\n Smack: allow to access /smack/access as normal user\n TOMOYO: Fix unused kernel config option.\n Smack: fix: invalid length set for the result of /smack/access\n Smack: compilation fix\n Smack: fix for /smack/access output, use string instead of byte\n Smack: domain transition protections (v3)\n Smack: Provide information for UDS getsockopt(SO_PEERCRED)\n Smack: Clean up comments\n Smack: Repair processing of fcntl\n Smack: Rule list lookup performance\n Smack: check permissions from user space (v2)\n TOMOYO: Fix quota and garbage collector.\n TOMOYO: Remove redundant tasklist_lock.\n TOMOYO: Fix domain transition failure warning.\n TOMOYO: Remove tomoyo_policy_memory_lock spinlock.\n TOMOYO: Simplify garbage collector.\n TOMOYO: Fix make namespacecheck warnings.\n target: check hex2bin result\n encrypted-keys: check hex2bin result\n ...\n" }, { "commit": "3321c07ae5068568cd61ac9f4ba749006a7185c9", "tree": "bcd169e21c2f71651ab840ee77152094db0c3deb", "parents": [ "6b07d30aca7e52f2881b8c8c20c8a2cd28e8b3d3" ], "author": { "name": "Peter Huewe", "email": "huewe.external.infineon@googlemail.com", "time": "Thu Sep 15 14:47:42 2011 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:46:41 2011 +1000" }, "message": "TPM: Zero buffer after copying to userspace\n\nSince the buffer might contain security related data it might be a good idea to\nzero the buffer after we have copied it to userspace.\n\nThis got assigned CVE-2011-1162.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Stable Kernel \u003cstable@kernel.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "6b07d30aca7e52f2881b8c8c20c8a2cd28e8b3d3", "tree": "58530bdef4c29cb4bf127942428190e9a2756b2c", "parents": [ "de69113ec1896443c732e8b812e8005fb44eeeeb" ], "author": { "name": "Peter Huewe", "email": "huewe.external.infineon@googlemail.com", "time": "Thu Sep 15 14:37:43 2011 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:46:29 2011 +1000" }, "message": "TPM: Call tpm_transmit with correct size\n\nThis patch changes the call of tpm_transmit by supplying the size of the\nuserspace buffer instead of TPM_BUFSIZE.\n\nThis got assigned CVE-2011-1161.\n\n[The first hunk didn\u0027t make sense given one could expect\n way less data than TPM_BUFSIZE, so added tpm_transmit boundary\n check over bufsiz instead\n The last parameter of tpm_transmit() reflects the amount\n of data expected from the device, and not the buffer size\n being supplied to it. It isn\u0027t ideal to parse it directly,\n so we just set it to the maximum the input buffer can handle\n and let the userspace API to do such job.]\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Stable Kernel \u003cstable@kernel.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "de69113ec1896443c732e8b812e8005fb44eeeeb", "tree": "9885a62b06d34dd407deb1c6c597a4f8ed73153a", "parents": [ "5ce5ed35939ece8a9c7e0f10c7f3d5bc000c6b64" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Thu Aug 04 07:58:07 2011 +0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:46:17 2011 +1000" }, "message": "TPM: tpm_nsc: Fix a double free of pdev in cleanup_nsc\n\nplatform_device_unregister() will release all resources\nand remove it from the subsystem, then drop reference count by\ncalling platform_device_put().\n\nWe should not call kfree(pdev) after platform_device_unregister(pdev).\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5ce5ed35939ece8a9c7e0f10c7f3d5bc000c6b64", "tree": "e6133feefe2935a5798c19c93ed8b2d8dac87bc9", "parents": [ "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon Aug 08 13:08:19 2011 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:45:57 2011 +1000" }, "message": "TPM: TCG_ATMEL should depend on HAS_IOPORT\n\nOn m68k, I get:\n\ndrivers/char/tpm/tpm_atmel.h: In function ‘atmel_get_base_addr’:\ndrivers/char/tpm/tpm_atmel.h:129: error: implicit declaration of function ‘ioport_map’\ndrivers/char/tpm/tpm_atmel.h:129: warning: return makes pointer from integer without a cast\n\nThe code in tpm_atmel.h supports PPC64 (using the device tree and ioremap())\nand \"anything else\" (using ioport_map()). However, ioportmap() is only\navailable on platforms that set HAS_IOPORT.\n\nAlthough PC64 seems to have HAS_IOPORT, a \"depends on HAS_IOPORT\" should work,\nbut I think it\u0027s better to expose the special PPC64 handling explicit using\n\"depends on PPC64 || HAS_IOPORT\".\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "403d1d0319ad73b5ccf251745af4c7000331a76b", "tree": "8f04137c79a0ab9c6e5104ba3bf439c6e9e6bb6a", "parents": [ "8ad346c62ae91e6376fb9d199ef8557b0c814209" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Tue Aug 23 08:52:10 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Aug 24 09:30:08 2011 +1000" }, "message": "tpm: suppress durations sysfs output if not read\n\nSuppress the output in the \u0027durations\u0027 sysfs entry if they were not read\nduring driver initialization. This is similar to other sysfs entries\nthat return nothing if for some reason sending the commands to the TPM\nfails.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "1560ffe62a9d53a51faeec7417becfba4f2a0d18", "tree": "022ba94ddeab5087c8c0c34008c98e4a7f8638c1", "parents": [ "3dab1bce8e840606e76f1bad5a009328e2aa35c7" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Aug 03 16:21:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:21 2011 -1000" }, "message": "tpm_tis: fix build when ACPI is not enabled\n\nFix tpm_tis.c build when CONFIG_ACPI is not enabled by providing a stub\nfunction. Fixes many build errors/warnings:\n\n drivers/char/tpm/tpm_tis.c:89: error: dereferencing pointer to incomplete type\n drivers/char/tpm/tpm_tis.c:89: warning: type defaults to \u0027int\u0027 in declaration of \u0027type name\u0027\n drivers/char/tpm/tpm_tis.c:89: error: request for member \u0027list\u0027 in something not a structure or union\n ...\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Leendert van Doorn \u003cleendert@watson.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "29412f0f6a19e34336368f13eab848091c343952", "tree": "36c1c422022b4cfb4a98b60dd936ca4f98d24911", "parents": [ "968543100a75bef892f52eb86e92e83b3b7bc581" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Jul 22 17:39:20 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Jul 26 10:34:34 2011 +1000" }, "message": "tpm_nsc: Fix bug when loading multiple TPM drivers\n\nThis patch fixes kernel bugzilla 34572.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d34572\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nTested-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "968543100a75bef892f52eb86e92e83b3b7bc581", "tree": "7a17de7337e3646641eed445532f0d71bc0f65c7", "parents": [ "6eb77b214985f8c2568f1f20f941790fbf8bf97b" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Sun Jul 17 01:04:24 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jul 22 17:33:24 2011 +1000" }, "message": "tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block\n\nThis patch moves the tpm_tis_reenable_interrupts function out of the\nCONFIG_PNP-surrounded #define block. This solves a compilation error in\ncase CONFIG_PNP is not defined.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "6eb77b214985f8c2568f1f20f941790fbf8bf97b", "tree": "52e34cb937b8f87585b354216e31c6c428c4f1b8", "parents": [ "0f2a55d5bb2372058275b0b343d90dd5d640d045" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Mon Jul 18 09:11:55 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jul 21 09:29:56 2011 +1000" }, "message": "tpm: Fix compilation warning when CONFIG_PNP is not defined\n\nThe is_itpm() function is only accessed from a block surrounded by\n#ifdef CONFIG_PNP. Therefore, also surround it with #ifdef CONFIG_PNP\nand remove the #else branch causing the warning.\n\nhttp://lxr.linux.no/#linux+v2.6.39/drivers/char/tpm/tpm_tis.c#L622\n\nv2:\n - fixes a previous typo\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c9206693457a946698e1d67db2b424e1d101493d", "tree": "59a79652ef211a9a6a935b4942ff015ff2569e8f", "parents": [ "9519de3f265f112e992aa7f446d905196bd608e8" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:34 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:09 2011 -0300" }, "message": "tpm: Fix a typo\n\nThis patch fixes a typo.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "9519de3f265f112e992aa7f446d905196bd608e8", "tree": "112d43561d9ffb478ebce085d202d77d85ad3a1a", "parents": [ "a7b66822b20f67f106690d0acee3d0ba667fd9bb" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:33 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:09 2011 -0300" }, "message": "tpm_tis: Probing function for Intel iTPM bug\n\nThis patch introduces a function for automatic probing for the Intel iTPM\nSTS_DATA_EXPECT flaw.\n\nThe patch splits the current tpm_tis_send function into 2 parts where the 1st\npart is now called tpm_tis_send_data() and merely sends the data to the TPM.\nThis function is then used for probing. The new tpm_tis_send function now\nfirst calls tpm_tis_send_data and if that succeeds has the TPM process the\ncommand and waits until the response is there.\n\nThe probing for the Intel iTPM is only invoked if the user has not passed\nitpm\u003d1 as parameter for the module *or* if such a TPM was detected via ACPI.\nPreviously it was necessary to pass itpm\u003d1 when also passing force\u003d1 to the\nmodule when doing a \u0027modprobe\u0027. This function is more general than the ACPI\ntest function and the function relying on ACPI could probably be removed.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "a7b66822b20f67f106690d0acee3d0ba667fd9bb", "tree": "c9b0ae416b45ae1b4c6fc453265e42394d60e352", "parents": [ "20b87bbfada971ae917cc2ff9dbc9dae05b94d25" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:32 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Fix the probing for interrupts\n\nThis patch fixes several aspects of the probing for interrupts.\n\nThis patch reads the TPM\u0027s timeouts before probing for the interrupts. The\ntpm_get_timeouts() function is invoked in polling mode and gets the proper\ntimeouts from the TPM so that we don\u0027t need to fall back to 2 minutes timeouts\nfor short duration commands while the interrupt probing is happening.\n\nThis patch introduces a variable probed_irq into the vendor structure that gets\nthe irq number if an interrupt is received while the the tpm_gen_interrupt()\nfunction is run in polling mode during interrupt probing. Previously some\nparts of tpm_gen_interrupt() were run in polling mode, then the irq variable\nwas set in the interrupt handler when an interrupt was received and execution\nof tpm_gen_interrupt() ended up switching over to interrupt mode.\ntpm_gen_interrupt() execution ended up on an event queue where it eventually\ntimed out since the probing handler doesn\u0027t wake any queues.\n\nBefore calling into free_irq() clear all interrupt flags that may have\nbeen set by the TPM. The reason is that free_irq() will call into the probing\ninterrupt handler and may otherwise fool us into thinking that a real interrupt\nhappened (because we see the flags as being set) while the TPM\u0027s interrupt line\nis not even connected to anything on the motherboard. This solves a problem\non one machine I did testing on (Thinkpad T60).\n\nIf a TPM claims to use a specifc interrupt, the probing is done as well\nto verify that the interrupt is actually working. If a TPM indicates\nthat it does not use a specific interrupt (returns \u00270\u0027), probe all interrupts\nfrom 3 to 15.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "20b87bbfada971ae917cc2ff9dbc9dae05b94d25", "tree": "deacbb011383a6a95922b8c49cd3c8e77c34afd2", "parents": [ "45baa1d1fa3926510ead93c96e6b0baa5ad79bd3" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:31 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Delay ACPI S3 suspend while the TPM is busy\n\nThis patch delays the (ACPI S3) suspend while the TPM is busy processing a\ncommand and the TPM TIS driver is run in interrupt mode. This is the same\nbehavior as we already have it for the TPM TIS driver in polling mode.\n\nReasoning: Some of the TPM\u0027s commands advance the internal state of the TPM.\nAn example would be the extending of one of its PCR registers. Upper layers,\nsuch as IMA or TSS (TrouSerS), would certainly want to be sure that the\ncommand succeeded rather than getting an error code (-62 \u003d -ETIME) that may\nnot give a conclusive answer as for what reason the command failed. Reissuing\nsuch a command would put the TPM into the wrong state, so waiting for it to\nfinish is really the only option.\n\nThe downside is that some commands (key creation) can take a long time and\nactually prevent the machine from entering S3 at all before the 20 second\ntimeout of the power management subsystem arrives.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "45baa1d1fa3926510ead93c96e6b0baa5ad79bd3", "tree": "aa90dcb72b808efc5392aba368ad60a07f58d587", "parents": [ "5a79444f24cb169b79f0f346482a42ab28329bae" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:30 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Re-enable interrupts upon (S3) resume\n\nThis patch makes sure that if the TPM TIS interface is run in interrupt mode\n(rather than polling mode) that all interrupts are enabled in the TPM\u0027s\ninterrupt enable register after a resume from ACPI S3 suspend. The registers\nmay either have been cleared by the TPM loosing its state during device sleep\nor by the BIOS leaving the TPM in polling mode (after sending a command to\nthe TPM for starting it up again)\n\nYou may want to check if your TPM runs with interrupts by doing\n\ncat /proc/interrupts | grep -i tpm\n\nand see whether there is an entry or otherwise for it to use interrupts:\n\nmodprobe tpm_tis interrupts\u003d1 [add \u0027itpm\u003d1\u0027 for Intel TPM ]\n\nv2:\n - the patch was adapted to work with the pnp and platform driver\n implementations in tpm_tis.c\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "5a79444f24cb169b79f0f346482a42ab28329bae", "tree": "23c1731a7d74b7a067b2ea5e0f1be501a6b7eeae", "parents": [ "6259210176510c64251a314ffb74834a790f09a0" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:29 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm: Fix display of data in pubek sysfs entry\n\nThis patch fixes the TPM\u0027s pubek sysfs entry that is accessible as long\nas the TPM doesn\u0027t have an owner. It was necessary to shift the access to the\ndata by -10 -- the first byte immediately follows the 10 byte header. The\nline\n\n \tdata \u003d tpm_cmd.params.readpubek_out_buffer;\n\nsets it at the offset \u002710\u0027 in the packet, so we can read the data array\nstarting at offset \u00270\u0027.\n\nBefore:\n\nAlgorithm: 00 0C 00 00\nEncscheme: 08 00\nSigscheme: 00 00\nParameters: 00 00 00 00 01 00 AC E2 5E 3C A0 78\nModulus length: -563306801\nModulus:\n28 21 08 0F 82 CD F2 B1 E7 49 F7 74 70 BE 59 8C\n43 78 B1 24 EA 52 E2 FE 52 5C 3A 12 3B DC 61 71\n[...]\n\nAfter:\n\nAlgorithm: 00 00 00 01\nEncscheme: 00 03\nSigscheme: 00 01\nParameters: 00 00 08 00 00 00 00 02 00 00 00 00\nModulus length: 256\nModulus:\nAC E2 5E 3C A0 78 DE 6C 9E CF 28 21 08 0F 82 CD\nF2 B1 E7 49 F7 74 70 BE 59 8C 43 78 B1 24 EA 52\n[...]\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "6259210176510c64251a314ffb74834a790f09a0", "tree": "41cdcab9da0e98e93f1b30b31d58ca13abd3ca9b", "parents": [ "e3e1a1e169d4e7f73c60ded937ebe24526bc6427" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:28 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Add timeouts sysfs entry\n\nDisplay the TPM\u0027s interface timeouts in a \u0027timeouts\u0027 sysfs entry. Display\nthe entries as having been adjusted when they were scaled due to their values\nbeing reported in milliseconds rather than microseconds.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "e3e1a1e169d4e7f73c60ded937ebe24526bc6427", "tree": "7851fd1700d3c40d5c03be60bb5c8942cb64b061", "parents": [ "829bf0675272d24ba0056f5f79e09544464f0c8d" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:27 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Adjust interface timeouts if they are too small\n\nAdjust the interface timeouts if they are found to be too small, i.e., if\nthey are returned in milliseconds rather than microseconds as we heared\nfrom Infineon that some (old) Infineon TPMs do.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "829bf0675272d24ba0056f5f79e09544464f0c8d", "tree": "7829db8e0f7ebff6596c0e0f2dd99aa82fa3de33", "parents": [ "04ab2293bbd36fc04060da93058cef7789414585" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:26 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Use interface timeouts returned from the TPM\n\nThe TPM driver currently discards the interface timeout values returned\nfrom the TPM. The check of the response packet needs to consider that\nthe return_code field is 0 on success and the size of the expected\npacket is equivalent to the header size + u32 length indicator for the\nTPM_GetCapability() result + 4 interface timeout indicators of type u32.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "04ab2293bbd36fc04060da93058cef7789414585", "tree": "051266e417a83140a7d2c80486f98e3c219d7eba", "parents": [ "e934acca1ee993e1d99d7dc203569a6e5cdfb392" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:25 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm_tis: Introduce durations sysfs entry\n\nDisplay the TPM\u0027s command timeouts in a \u0027durations\u0027 sysfs entry. Display\nthe entries as having been adjusted when they were scaled due to their values\nbeing reported in milliseconds rather than microseconds.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "e934acca1ee993e1d99d7dc203569a6e5cdfb392", "tree": "e0ac7a2305c0b2633a798721e5fe5b95c6d89d98", "parents": [ "979b140614a5459f340f5f8b1641ef77c863d899" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:24 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Adjust the durations if they are too small\n\nAdjust the durations if they are found to be too small, i.e., if they are\nreturned in milliseconds rather than microseconds as some Infineon TPMs are\nreported to do.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "979b140614a5459f340f5f8b1641ef77c863d899", "tree": "187c508ee023f34e755a7416349c1936c03a31fe", "parents": [ "97fb35e413f256ded07b88c73b3d932ec31ea84e" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:23 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Use durations returned from TPM\n\nThe TPM driver currently discards the durations values returned\nfrom the TPM. The check of the response packet needs to consider that\nthe return_code field is 0 on success and the size of the expected\npacket is equivalent to the header size + u32 length indicator for the\nTPM_GetCapability() result + 3 timeout indicators of type u32.\n\nv4:\n- sysfs entry \u0027durations\u0027 is now a patch of its own\n- the work-around for TPMs reporting durations in milliseconds is now in a\n patch of its own\n\nv3:\n- sysfs entry now called \u0027durations\u0027 to resemble TPM-speak (previously\n was called \u0027timeouts\u0027)\n\nv2:\n- adjusting all timeouts for TPM devices reporting timeouts in msec rather\n than usec\n- also displaying in sysfs whether the timeouts are \u0027original\u0027 or \u0027adjusted\u0027\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "1309d7afbed112f0e8e90be9af975550caa0076b", "tree": "750110269ee7a6d977494c5fb696af109ecb0aad", "parents": [ "0444d76ae64fffc7851797fc1b6ebdbb44ac504a" ], "author": { "name": "Peter Huewe", "email": "huewe.external.infineon@googlemail.com", "time": "Tue Mar 29 13:31:25 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 29 09:45:34 2011 -0700" }, "message": "char/tpm: Fix unitialized usage of data buffer\n\nThis patch fixes information leakage to the userspace by initializing\nthe data buffer to zero.\n\nReported-by: Peter Huewe \u003chuewe.external@infineon.com\u003e\nSigned-off-by: Peter Huewe \u003chuewe.external@infineon.com\u003e\nSigned-off-by: Marcel Selhorst \u003cm.selhorst@sirrix.com\u003e\n[ Also removed the silly \"* sizeof(u8)\". If that isn\u0027t 1, we have way\n deeper problems than a simple multiplication can fix. - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d1dc20e8d689c7e6a0a4d2c94e36a99d5793ecb", "tree": "a25396484b9e824179bbc8f657f895b9540a38ae", "parents": [ "3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 01 13:23:27 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 01 13:23:27 2011 -0800" }, "message": "Revert \"TPM: Long default timeout fix\"\n\nThis reverts commit c4ff4b829ef9e6353c0b133b7adb564a68054979.\n\nTed Ts\u0027o reports:\n\n \"TPM is working for me so I can log into employer\u0027s network in 2.6.37.\n It broke when I tried 2.6.38-rc6, with the following relevant lines\n from my dmesg:\n\n [ 11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78)\n [ 25.734114] tpm_tis 00:0b: Operation Timed out\n [ 78.040949] tpm_tis 00:0b: Operation Timed out\n\n This caused me to get suspicious, especially since the _other_ TPM\n commit in 2.6.38 had already been reverted, so I tried reverting\n commit c4ff4b829e: \"TPM: Long default timeout fix\". With this commit\n reverted, my TPM on my Lenovo T410 is once again working.\"\n\nRequested-and-tested-by: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e58713724059da7d2982d6ad945192c8fca5b729", "tree": "f22d77710dd461242e084ffbbfcf2fd4600cbd7b", "parents": [ "b4c9bfab2ec7389d42fdc39093959f533e7b4281" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 20 10:03:12 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 20 10:03:12 2011 -0800" }, "message": "Revert \"tpm_tis: Use timeouts returned from TPM\"\n\nThis reverts commit 9b29050f8f75916f974a2d231ae5d3cd59792296.\n\nIt has caused hibernate regressions, for example Juri Sladby\u0027s report:\n\n \"I\u0027m unable to hibernate 2.6.37.1 unless I rmmod tpm_tis:\n [10974.074587] Suspending console(s) (use no_console_suspend to debug)\n [10974.103073] tpm_tis 00:0c: Operation Timed out\n [10974.103089] legacy_suspend(): pnp_bus_suspend+0x0/0xa0 returns -62\n [10974.103095] PM: Device 00:0c failed to freeze: error -62\"\n\nand Rafael points out that some of the new conditionals in that commit\nseem to make no sense. This commit needs more work and testing, let\u0027s\nrevert it for now.\n\nReported-by: Norbert Preining \u003cpreining@logic.at\u003e\nReported-and-requested-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nCc: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b29050f8f75916f974a2d231ae5d3cd59792296", "tree": "e556ea7e22297756159a1c564ed576671c419fb8", "parents": [ "d3d373e0e3f51f335d8c722dd1340ab812fdf94b" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Tue Jan 11 14:37:29 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Fri Feb 11 01:30:50 2011 -0200" }, "message": "tpm_tis: Use timeouts returned from TPM\n\nThe current TPM TIS driver in git discards the timeout values returned\nfrom the TPM. The check of the response packet needs to consider that\nthe return_code field is 0 on success and the size of the expected\npacket is equivalent to the header size + u32 length indicator for the\nTPM_GetCapability() result + 3 timeout indicators of type u32.\n\nI am also adding a sysfs entry \u0027timeouts\u0027 showing the timeouts that are\nbeing used.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "e5cce6c13c25d9ac56955a3ae2fd562719848172", "tree": "29ed2e65da52bda2d16a77425102f3a8813fcef1", "parents": [ "c4ff4b829ef9e6353c0b133b7adb564a68054979" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 06 21:24:01 2011 -0600" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 24 11:29:55 2011 +1100" }, "message": "tpm: fix panic caused by \"tpm: Autodetect itpm devices\"\n\ncommit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for\nPNP device id to the common tpm_tis_init() function, which in some\ncases (force\u003d1) will be called without the device being a member of\na pnp_dev. Oopsing and panics ensue.\n\nMove the test up to before the call to tpm_tis_init(), since it\njust modifies a global variable anyway.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c4ff4b829ef9e6353c0b133b7adb564a68054979", "tree": "0b32c7b91763144ea587e2965f5a401eea3d537c", "parents": [ "5403110943a2dcf1f96416d7a412a8b46895facd" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Fri Nov 12 22:30:02 2010 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 24 11:22:48 2011 +1100" }, "message": "TPM: Long default timeout fix\n\nIf duration variable value is 0 at this point, it\u0027s because\nchip-\u003evendor.duration wasn\u0027t filled by tpm_get_timeouts() yet.\nThis patch sets then the lowest timeout just to give enough\ntime for tpm_get_timeouts() to further succeed.\n\nThis fix avoids long boot times in case another entity attempts\nto send commands to the TPM when the TPM isn\u0027t accessible.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d2e7ad19229f982fc1eb731827d82ceac90abfb3", "tree": "98a3741b4d4b27a48b3c7ea9babe331e539416a8", "parents": [ "d03a5d888fb688c832d470b749acc5ed38e0bc1d", "0c21e3aaf6ae85bee804a325aa29c325209180fd" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 10 09:46:24 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 10 09:46:24 2011 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tsecurity/smack/smack_lsm.c\n\nVerified and added fix by Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nOk\u0027d by Casey Schaufler \u003ccasey@schaufler-ca.com\u003e\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "23d69b09b78c4876e134f104a3814c30747c53f1", "tree": "40744de4f4126c21027ce537264524095e0e7979", "parents": [ "e744070fd4ff9d3114277e52d77afa21579adce2", "569ff2de2e1c8ac67c8df3a7367d46d0d9460a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)\n usb: don\u0027t use flush_scheduled_work()\n speedtch: don\u0027t abuse struct delayed_work\n media/video: don\u0027t use flush_scheduled_work()\n media/video: explicitly flush request_module work\n ioc4: use static work_struct for ioc4_load_modules()\n init: don\u0027t call flush_scheduled_work() from do_initcalls()\n s390: don\u0027t use flush_scheduled_work()\n rtc: don\u0027t use flush_scheduled_work()\n mmc: update workqueue usages\n mfd: update workqueue usages\n dvb: don\u0027t use flush_scheduled_work()\n leds-wm8350: don\u0027t use flush_scheduled_work()\n mISDN: don\u0027t use flush_scheduled_work()\n macintosh/ams: don\u0027t use flush_scheduled_work()\n vmwgfx: don\u0027t use flush_scheduled_work()\n tpm: don\u0027t use flush_scheduled_work()\n sonypi: don\u0027t use flush_scheduled_work()\n hvsi: don\u0027t use flush_scheduled_work()\n xen: don\u0027t use flush_scheduled_work()\n gdrom: don\u0027t use flush_scheduled_work()\n ...\n\nFixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c\nas per Tejun.\n" }, { "commit": "2e5c44c92046c41607794666ffc0d6945945acb0", "tree": "12e176d61db90d57d93318d020adc5e6fe543f47", "parents": [ "3514870f06a7907bc46361aebc3daf5ea4e97eeb" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "message": "tpm: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is deprecated and scheduled to be removed.\nDirectly flush chip-\u003ework instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "3f0d3d016d89a5efb8b926d4707eb21fa13f3d27", "tree": "9cf5a19b80d8c935db98110f2ac822c74f9ec9b9", "parents": [ "72083646528d4887b920deb71b37e09bc7d227bb" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Thu Oct 21 17:42:40 2010 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 30 09:18:01 2010 +1100" }, "message": "tpm: Autodetect itpm devices\n\nSome Lenovos have TPMs that require a quirk to function correctly. This can\nbe autodetected by checking whether the device has a _HID of INTC0102. This\nis an invalid PNPid, and as such is discarded by the pnp layer - however\nit\u0027s still present in the ACPI code, so we can pull it out that way. This\nmeans that the quirk won\u0027t be automatically applied on non-ACPI systems,\nbut without ACPI we don\u0027t have any way to identify the chip anyway so I\ndon\u0027t think that\u0027s a great concern.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nTested-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nTested-by: Andy Isaacson \u003cadi@hexapodia.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c749ba912e87ccebd674ae24b97462176c63732e", "tree": "72dff433660102d7eba7186f35bbd2aab21b1b6a", "parents": [ "a0e39349d80d8b5deeb264fb190bd064f7063252" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Nov 23 18:54:16 2010 -0500" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Nov 29 08:55:22 2010 +1100" }, "message": "key: add tpm_send command\n\nAdd internal kernel tpm_send() command used to seal/unseal keys.\n\nChangelog:\n- replaced module_put in tpm_send() with new tpm_chip_put() wrapper\n (suggested by David Howells)\n- Make tpm_send() cmd argument a \u0027void *\u0027 (suggested by David Howells)\n\nSigned-off-by: David Safford \u003csafford@watson.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "a0e39349d80d8b5deeb264fb190bd064f7063252", "tree": "51269aaf15b299c2afcb1bb53bf95580769fc22a", "parents": [ "dc88e46029486ed475c71fe1bb696d39511ac8fe" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Nov 23 17:50:32 2010 -0500" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Nov 29 08:55:19 2010 +1100" }, "message": "tpm: add module_put wrapper\n\nFor readability, define a tpm_chip_put() wrapper to call module_put().\nReplace existing module_put() calls with the wrapper.\n\n(Change based on trusted/encrypted patchset review by David Howells.)\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: David Safford \u003csafford@watson.ibm.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "9b3056cca09529d34af2d81305b2a9c6b622ca1b", "tree": "2b457203d005bd845480c6a9858cd0a8d9f53e4a", "parents": [ "36f7f28416c97dbb725154930066d115b4447e17" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Oct 01 14:16:39 2010 -0700" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Oct 21 10:12:42 2010 +1100" }, "message": "tpm: change \u0027tpm_suspend_pcr\u0027 to be module parameter\n\nFix the following warning:\n\ndrivers/char/tpm/tpm.c:1085: warning: `tpm_suspend_setup\u0027 defined but not used\n\nand make the workaround operable in case when TPM is compiled as a module.\nAs a side-effect the option will be called tpm.suspend_pcr.\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: David Safford \u003csafford@watson.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "59f6fbe4291fcc078ba26ce4edf8373a7620a13a", "tree": "1ca4be1a5cb996ace569fccded07e502a70bd32e", "parents": [ "86c65a7857896b1de99628ad392556965c4841e6" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Jun 23 12:18:56 2010 -0700" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jul 26 10:25:45 2010 +1000" }, "message": "tpm_tis: fix subsequent suspend failures\n\nFix subsequent suspends by issuing tpm_continue_selftest during resume.\nOtherwise, the tpm chip seems to be not fully initialized and will reject\nthe save state command during suspend, thus preventing the whole system\nto suspend.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16256\n\nSigned-off-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: David Safford \u003csafford@watson.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "02a077c52ef7631275a79862ffd9f3dbe9d38bc2", "tree": "e7101d617847953dbf28f8658251b7401c4135b3", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Mon Jun 14 13:58:22 2010 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Jun 15 09:26:28 2010 +1000" }, "message": "TPM: ReadPubEK output struct fix\n\nThis patch adds a missing element of the ReadPubEK command output,\nthat prevents future overflow of this buffer when copying the\nTPM output result into it.\n\nPrevents a kernel panic in case the user tries to read the\npubek from sysfs.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "7f2ab000c6f2ae46070807a3bf645c45d8639460", "tree": "e6488635d01b71d4e469e89f9035efe501b1d56d", "parents": [ "b3139bbc52762268769e7af842aade0e64372433" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Thu May 13 17:37:54 2010 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon May 17 09:08:18 2010 +1000" }, "message": "TPM: ACPI/PNP dependency removal\n\nThis patch pushes the ACPI dependency into the device driver code\nitself. Now, even without ACPI/PNP enabled, the device can be registered\nusing the TIS specified memory space. This will however result in the\nlack of access to the BIOS event log, being the only implication of such\nACPI removal.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ec4a162af388a2716c5314c4aff7029071d09f57", "tree": "10b5c972f756620c8bba693a4363029c42d37ef3", "parents": [ "f70e2e06196ad4c1c762037da2f75354f6c16b81" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 07 09:19:29 2010 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 07 09:19:29 2010 +1000" }, "message": "Revert \"TPM: ACPI/PNP dependency removal\"\n\nThis reverts commit b89e66e1e396f7b5436af154e58209320cc08aed.\n\n\u003e \u003e When CONFIG_PM is not set:\n\u003e \u003e\n\u003e \u003e drivers/built-in.o: In function `acpi_init\u0027:\n\u003e \u003e bus.c:(.init.text+0x2d84): undefined reference to `pm_flags\u0027\n\u003e \u003e bus.c:(.init.text+0x2d91): undefined reference to `pm_flags\u0027\n\u003e\n\u003e CONFIG_ACPI depends on CONFIG_PM,\n\u003e so acpi/bus.c should not be compiled for CONFIG_PM\u003dn\n\u003e\n\u003e Hmm, is is somebody doing something strange, like \"select ACPI\"\n\u003e without guaranteeing that all of ACPI\u0027s dependencies are satisfied?\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "0ffbe2699cda6afbe08501098dff8a8c2fe6ae09", "tree": "81b1a2305d16c873371b65c5a863c0268036cefe", "parents": [ "4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6", "7ebd467551ed6ae200d7835a84bbda0dcadaa511" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu May 06 10:56:07 2010 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu May 06 10:56:07 2010 +1000" }, "message": "Merge branch \u0027master\u0027 into next\n" }, { "commit": "b89e66e1e396f7b5436af154e58209320cc08aed", "tree": "c966432f8e7bcc40f977546306b63beb0f8599fb", "parents": [ "fcaaade1db63bb2d6f7611d7824eb50d2f07a546" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue May 04 18:49:20 2010 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed May 05 09:59:57 2010 +1000" }, "message": "TPM: ACPI/PNP dependency removal\n\nThis patch pushes the ACPI dependency into the device driver code\nitself. Now, even without ACPI/PNP enabled, the device can be registered\nusing the TIS specified memory space. This will however result in the\nlack of access to the bios event log, being the only implication of such\nACPI removal.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "225a9be24d799aa16d543c31fb09f0c9ed1d9caa", "tree": "e2db049524c7f153457e55506d1ef4cec0ccf39c", "parents": [ "310de047eef6685274045db1e6b39c9f313df428" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Thu Mar 25 00:55:32 2010 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Mar 26 09:30:03 2010 +1100" }, "message": "TPM: workaround to enforce PCR updates across suspends\n\nAdd a workaround for TPM\u0027s which fail to flush last written\nPCR values in a TPM_SaveState, in preparation for suspend.\n\nSigned-off-by: David Safford \u003csafford@watson.ibm.com\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "93716b9470fbfd9efdc7d0f2445cb34635de3f6d", "tree": "4793e53b0ed27f5791a73e851d52296b63c4d7f8", "parents": [ "f79f11852831ba8837e82b73364e6f1cd0145499" ], "author": { "name": "Marcel Selhorst", "email": "m.selhorst@sirrix.com", "time": "Wed Feb 10 13:56:32 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 11 13:59:42 2010 -0800" }, "message": "tpm_infineon: fix suspend/resume handler for pnp_driver\n\nWhen suspending, tpm_infineon calls the generic suspend function of the\nTPM framework. However, the TPM framework does not return and the system\nhangs upon suspend. When sending the necessary command \"TPM_SaveState\"\ndirectly within the driver, suspending and resuming works fine.\n\nSigned-off-by: Marcel Selhorst \u003cm.selhorst@sirrix.com\u003e\nCc: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.32.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "31bde71c202722a76686c3cf69a254c8a912275a", "tree": "afa7ff8cfa8652fb0970e3546bbe8d7b89c531e3", "parents": [ "3507d612366a4e81226295f646410130a1f62a5c" ], "author": { "name": "Matt Domsch", "email": "Matt_Domsch@dell.com", "time": "Tue Nov 03 12:05:50 2009 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 03 12:05:50 2009 +1100" }, "message": "tpm: autoload tpm_tis based on system PnP IDs\n\nThe tpm_tis driver already has a list of supported pnp_device_ids.\nThis patch simply exports that list as a MODULE_DEVICE_TABLE() so that\nthe module autoloader will discover and load the module at boottime.\n\nSigned-off-by: Matt Domsch \u003cMatt_Domsch@dell.com\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3507d612366a4e81226295f646410130a1f62a5c", "tree": "046ef656112c1ee650518a0bbeab43adf1522b93", "parents": [ "5975c725dfd6f7d36f493ab1453fbdbd35c1f0e3" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Thu Sep 10 17:09:35 2009 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Nov 02 09:09:04 2009 +1100" }, "message": "tpm_tis: TPM_STS_DATA_EXPECT workaround\n\nSome newer Lenovo models are shipped with a TPM that doesn\u0027t seem to set the TPM_STS_DATA_EXPECT status bit\nwhen sending it a burst of data, so the code understands it as a failure and doesn\u0027t proceed sending the chip\nthe intended data. In this patch we bypass this bit check in case the itpm module parameter was set.\n\nThis patch is based on Andy Isaacson\u0027s one:\n\nhttp://marc.info/?l\u003dlinux-kernel\u0026m\u003d124650185023495\u0026w\u003d2\n\nIt was heavily discussed how should we deal with identifying the chip in kernel space, but the required\npatch to do so was NACK\u0027d:\n\nhttp://marc.info/?l\u003dlinux-kernel\u0026m\u003d124650186423711\u0026w\u003d2\n\nThis way we let the user choose using this workaround or not based on his\nobservations on this code behavior when trying to use the TPM.\n\nFixed a checkpatch issue present on the previous patch, thanks to Daniel Walker.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nTested-by: Seiji Munetoh \u003cseiji.munetoh@gmail.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "23acb98de5a4109a60b5fe3f0439389218b039d7", "tree": "e0e9dec7125ecf6a0121225d8f6b1bced8266d82", "parents": [ "af8ff04917169805b151280155bf772d3ca9bec0" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Sep 30 12:26:55 2009 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Oct 01 07:59:17 2009 +1000" }, "message": "TPM: fix pcrread\n\nThe previously sent patch:\n\nhttp://marc.info/?l\u003dtpmdd-devel\u0026m\u003d125208945007834\u0026w\u003d2\n\nHad its first hunk cropped when merged, submitting only this first hunk\nagain.\n\nSigned-off-by: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Marcel Selhorst \u003cm.selhorst@sirrix.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nTested-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "1669b049db50fc7f1d4e694fb115a0f408c63fce", "tree": "9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20", "parents": [ "7f366784f5c2b8fc0658b5b374f4c63ee42c789f", "17d857be649a21ca90008c6dc425d849fa83db5c" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Sep 30 07:47:33 2009 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Sep 30 07:47:33 2009 +1000" }, "message": "Merge branch \u0027master\u0027 into next\n" }, { "commit": "7f366784f5c2b8fc0658b5b374f4c63ee42c789f", "tree": "7b0f60ae59ac00cc0fcae48bc2ecc89f809ee8f6", "parents": [ "86d710146fb9975f04c505ec78caa43d227c1018" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Thu Sep 24 16:27:46 2009 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Sep 24 13:47:12 2009 -0700" }, "message": "TPM: increase default TPM buffer\n\nThe TPM Working Group requested this communication buffer increase given that a\nparticular TPM vendor can support a TPM_SHA1Start command input bigger than the\ncurrent size.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c82ffab9a857f8286ed2b559624b7005a367b638", "tree": "a5d0895a0b55c2db1bf36f517ca273e7e0abdf71", "parents": [ "a724eada8c2a7b62463b73ccf73fd0bb6e928aeb", "5224ee086321fec78970e2f2805892d2b34e8957" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:18:57 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:18:57 2009 -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 SELinux: do not destroy the avc_cache_nodep\n KEYS: Have the garbage collector set its timer for live expired keys\n tpm-fixup-pcrs-sysfs-file-update\n creds_are_invalid() needs to be exported for use by modules:\n include/linux/cred.h: fix build\n\nFix trivial BUILD_BUG_ON-induced conflicts in drivers/char/tpm/tpm.c\n" }, { "commit": "0afd9056f1b43c9fcbfdf933b263d72023d382fe", "tree": "f590f4afa4f090c8655c8536684068cdf13ca4d9", "parents": [ "764db03fee50f7a3de91de80ef4a943f0d720801" ], "author": { "name": "Jason Gunthorpe", "email": "jgunthorpe@obsidianresearch.com", "time": "Fri Sep 18 12:54:24 2009 -0700" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Sep 23 11:03:40 2009 -0700" }, "message": "tpm-fixup-pcrs-sysfs-file-update\n\nSigned-off-by: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Marcel Selhorst \u003cm.selhorst@sirrix.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "8c87df457cb58fe75b9b893007917cf8095660a0", "tree": "32446b329e4b83ae6158fa1505c36634a75dbfe8", "parents": [ "1fe72eaa0f46a0fa4cdcd8f3f7853b6d39469784" ], "author": { "name": "Jan Beulich", "email": "JBeulich@novell.com", "time": "Tue Sep 22 16:43:52 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:29 2009 -0700" }, "message": "BUILD_BUG_ON(): fix it and a couple of bogus uses of it\n\ngcc permitting variable length arrays makes the current construct used for\nBUILD_BUG_ON() useless, as that doesn\u0027t produce any diagnostic if the\ncontrolling expression isn\u0027t really constant. Instead, this patch makes\nit so that a bit field gets used here. Consequently, those uses where the\ncondition isn\u0027t really constant now also need fixing.\n\nNote that in the gfp.h, kmemcheck.h, and virtio_config.h cases\nMAYBE_BUILD_BUG_ON() really just serves documentation purposes - even if\nthe expression is compile time constant (__builtin_constant_p() yields\ntrue), the array is still deemed of variable length by gcc, and hence the\nwhole expression doesn\u0027t have the intended effect.\n\n[akpm@linux-foundation.org: make arch/sparc/include/asm/vio.h compile]\n[akpm@linux-foundation.org: more nonsensical assertions in tpm.c..]\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Mimi Zohar \u003czohar@us.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "88e9d34c727883d7d6f02cf1475b3ec98b8480c7", "tree": "475f544536d52739e0929e7727cab5124e855a06", "parents": [ "b7ed698cc9d556306a4088c238e2ea9311ea2cb3" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Sep 22 16:43:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:29 2009 -0700" }, "message": "seq_file: constify seq_operations\n\nMake all seq_operations structs const, to help mitigate against\nrevectoring user-triggerable function pointers.\n\nThis is derived from the grsecurity patch, although generated from scratch\nbecause it\u0027s simpler than extracting the changes from there.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nAcked-by: Casey Schaufler \u003ccasey@schaufler-ca.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ec57935837a78f9661125b08a5d08b697568e040", "tree": "31379df297fc188ba5120edc8db9bc628f30d319", "parents": [ "ddd29ec6597125c830f7badb608a86c98b936b64" ], "author": { "name": "Jason Gunthorpe", "email": "jgunthorpe@obsidianresearch.com", "time": "Wed Sep 09 17:22:18 2009 -0600" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Sep 10 19:19:09 2009 +1000" }, "message": "TPM: Fixup boot probe timeout for tpm_tis driver\n\nWhen probing the device in tpm_tis_init the call request_locality\nuses timeout_a, which wasn\u0027t being initalized until after\nrequest_locality. This results in request_locality falsely timing\nout if the chip is still starting. Move the initialization to before\nrequest_locality.\n\nThis probably only matters for embedded cases (ie mine), a BIOS likely\ngets the TPM into a state where this code path isn\u0027t necessary.\n\nSigned-off-by: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "405f55712dfe464b3240d7816cc4fe4174831be2", "tree": "96c425ea7fa8b31058b8f83a433c5e5265c8ebc7", "parents": [ "f9fabcb58a6d26d6efde842d1703ac7cfa9427b6" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sat Jul 11 22:08:37 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 12 12:22:34 2009 -0700" }, "message": "headers: smp_lock.h redux\n\n* Remove smp_lock.h from files which don\u0027t need it (including some headers!)\n* Add smp_lock.h to files which do need it\n* Make smp_lock.h include conditional in hardirq.h\n It\u0027s needed only for one kernel_locked() usage which is under CONFIG_PREEMPT\n\n This will make hardirq.h inclusion cheaper for every PREEMPT\u003dn config\n (which includes allmodconfig/allyesconfig, BTW)\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fbaa58696cef848de818768783ef185bd3f05158", "tree": "0055562c31266189533099d34f0909a0ec4c0bd4", "parents": [ "279e677faa775ad16e75c32e1bf4a37f8158bc61" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Wed May 13 12:50:40 2009 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed May 20 08:30:05 2009 +1000" }, "message": "TPM: get_event_name stack corruption\n\nget_event_name uses sprintf to fill a buffer declared on the stack. It fills\nthe buffer 2 bytes at a time. What the code doesn\u0027t take into account is that\nsprintf(buf, \"%02x\", data) actually writes 3 bytes. 2 bytes for the data and\nthen it nul terminates the string. Since we declare buf to be 40 characters\nlong and then we write 40 bytes of data into buf sprintf is going to write 41\ncharacters. The fix is to leave room in buf for the nul terminator.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "0c93ea4064a209cdc36de8a9a3003d43d08f46f7", "tree": "ff19952407c523a1349ef56c05993416dd28437e", "parents": [ "bc2fd381d8f9dbeb181f82286cdca1567e3d0def", "e6e66b02e11563abdb7f69dcb7a2efbd8d577e77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 11:17:04 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 11:17:04 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)\n Dynamic debug: fix pr_fmt() build error\n Dynamic debug: allow simple quoting of words\n dynamic debug: update docs\n dynamic debug: combine dprintk and dynamic printk\n sysfs: fix some bin_vm_ops errors\n kobject: don\u0027t block for each kobject_uevent\n sysfs: only allow one scheduled removal callback per kobj\n Driver core: Fix device_move() vs. dpm list ordering, v2\n Driver core: some cleanup on drivers/base/sys.c\n Driver core: implement uevent suppress in kobject\n vcs: hook sysfs devices into object lifetime instead of \"binding\"\n driver core: fix passing platform_data\n driver core: move platform_data into platform_device\n sysfs: don\u0027t block indefinitely for unmapped files.\n driver core: move knode_bus into private structure\n driver core: move knode_driver into private structure\n driver core: move klist_children into private structure\n driver core: create a private portion of struct device\n driver core: remove polling for driver_probe_done(v5)\n sysfs: reference sysfs_dirent from sysfs inodes\n ...\n\nFixed conflicts in drivers/sh/maple/maple.c manually\n" }, { "commit": "7a192ec334cab9fafe3a8665a65af398b0e24730", "tree": "eea572863500f94d446cfded69835e188dba3447", "parents": [ "6da2d377bba06c29d0bc41c8dee014164dec82a7" ], "author": { "name": "Ming Lei", "email": "tom.leiming@gmail.com", "time": "Fri Feb 06 23:40:12 2009 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Mar 24 16:38:25 2009 -0700" }, "message": "platform driver: fix incorrect use of \u0027platform_bus_type\u0027 with \u0027struct device_driver\u0027\n\nThis patch fixes the bug reported in\n\thttp://bugzilla.kernel.org/show_bug.cgi?id\u003d11681.\n\n\"Lots of device drivers register a \u0027struct device_driver\u0027 with\nthe \u0027.bus\u0027 member set to \u0027\u0026platform_bus_type\u0027. This is wrong,\nsince the platform_bus functions expect the \u0027struct device_driver\u0027\nto be wrapped up in a \u0027struct platform_driver\u0027 which provides\nsome additional callbacks (like suspend_late, resume_early).\nThe effect may be that platform_suspend_late() uses bogus data\noutside the device_driver struct as a pointer pointer to the\ndevice driver\u0027s suspend_late() function or other hard to\nreproduce failures.\"(Lothar Wassmann)\n\nSigned-off-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nAcked-by: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "703a3cd72817e99201cef84a8a7aecc60b2b3581", "tree": "3e943755178ff410694722bb031f523136fbc432", "parents": [ "df7f54c012b92ec93d56b68547351dcdf8a163d3", "8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Mar 24 10:52:46 2009 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Mar 24 10:52:46 2009 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n" }, { "commit": "7dcce1334fa5879dc12bee001962e8f74bce60f1", "tree": "f6c834ed80a629ee11da5eb738f821b74a2adfb1", "parents": [ "508b9f8efdad123b202b228f71f59feba51e4fb5" ], "author": { "name": "Marcel Selhorst", "email": "m.selhorst@sirrix.com", "time": "Wed Feb 11 13:04:27 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 14:25:35 2009 -0800" }, "message": "tpm: correct email address for tpm_infineon-driver\n\nUpdate my email address.\n\nSigned-off-by: Marcel Selhorst \u003cm.selhorst@sirrix.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cb5629b10d64a8006622ce3a52bc887d91057d69", "tree": "7c06d8f30783115e3384721046258ce615b129c5", "parents": [ "8920d5ad6ba74ae8ab020e90cc4d976980e68701", "f01d1d546abb2f4028b5299092f529eefb01253a" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 06 11:01:45 2009 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 06 11:01:45 2009 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tfs/namei.c\n\nManually merged per:\n\ndiff --cc fs/namei.c\nindex 734f2b5,bbc15c2..0000000\n--- a/fs/namei.c\n+++ b/fs/namei.c\n@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char\n \t\tnd-\u003eflags |\u003d LOOKUP_CONTINUE;\n \t\terr \u003d exec_permission_lite(inode);\n \t\tif (err \u003d\u003d -EAGAIN)\n- \t\t\terr \u003d vfs_permission(nd, MAY_EXEC);\n+ \t\t\terr \u003d inode_permission(nd-\u003epath.dentry-\u003ed_inode,\n+ \t\t\t\t\t MAY_EXEC);\n +\t\tif (!err)\n +\t\t\terr \u003d ima_path_check(\u0026nd-\u003epath, MAY_EXEC);\n \t\tif (err)\n \t\t\tbreak;\n\n@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc\n \t\tflag \u0026\u003d ~O_TRUNC;\n \t}\n\n- \terror \u003d vfs_permission(nd, acc_mode);\n+ \terror \u003d inode_permission(inode, acc_mode);\n \tif (error)\n \t\treturn error;\n +\n- \terror \u003d ima_path_check(\u0026nd-\u003epath,\n++\terror \u003d ima_path_check(path,\n +\t\t\t acc_mode \u0026 (MAY_READ | MAY_WRITE | MAY_EXEC));\n +\tif (error)\n +\t\treturn error;\n \t/*\n \t * An append-only file must be opened in append mode for writing.\n \t */\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "8920d5ad6ba74ae8ab020e90cc4d976980e68701", "tree": "0ab5e0f47ed226a91e5520d9dcceee7d76ac7cac", "parents": [ "64c61d80a6e4c935a09ac5ff1d952967ca1268f8" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Thu Feb 05 13:06:30 2009 -0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 06 09:06:43 2009 +1100" }, "message": "TPM: integrity fix\n\nFix to function which is called by IMA, now tpm_chip_find_get() considers the case in which the machine doesn\u0027t have a TPM or, if it has, its TPM isn\u0027t enabled.\n\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "659aaf2bb5496a425ba14036b5b5900f593e4484", "tree": "a9736fc70c8837665bc0f0a375dab5382941d77a", "parents": [ "0883743825e34b81f3ff78aaee3a97cba57586c5" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Mon Feb 02 15:23:44 2009 -0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Feb 03 11:23:12 2009 +1100" }, "message": "TPM: integrity interface\n\nThis patch adds internal kernel support for:\n - reading/extending a pcr value\n - looking up the tpm_chip for a given chip number\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "0883743825e34b81f3ff78aaee3a97cba57586c5", "tree": "9b9e7f2d4dca611aee61c7c0245956f5fd830d91", "parents": [ "faa3aad75a959f55e7783f4dc7840253c7506571" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Mon Feb 02 15:23:43 2009 -0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Feb 03 11:23:09 2009 +1100" }, "message": "TPM: sysfs functions consolidation\n\nAccording to Dave Hansen\u0027s comments on the tpm_show_*, some of these functions\npresent a pattern when allocating data[] memory space and also when setting its\ncontent. A new function was created so that this pattern could be consolidated.\nAlso, replaced the data[] command vectors and its indexes by meaningful structures\nas pointed out by Matt Helsley too.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "b2576e1d4408e134e2188c967b1f28af39cd79d4", "tree": "004f3c82faab760f304ce031d6d2f572e7746a50", "parents": [ "3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77", "2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Jan 09 03:39:43 2009 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Jan 09 03:39:43 2009 -0500" }, "message": "Merge branch \u0027linus\u0027 into release\n" }, { "commit": "09f50c95425318232c534d931d8c28b96a3ce2c5", "tree": "7182e7ae67de2e8b7d0cc58c2e746368e11f2c10", "parents": [ "ad8f07ccaddca1b0f52d0e9677855122a46cfafc" ], "author": { "name": "David Smith", "email": "dds@google.com", "time": "Wed Jan 07 18:08:57 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:12 2009 -0800" }, "message": "tpm: clean up tpm_nsc driver for platform_device suspend/resume compliance\n\nSigned-off-by: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ea7e96e0f2277107d9ea14c3f16c86ba82b2e560", "tree": "62d7de39d24e001b9df29fbafdaed252cdb91191", "parents": [ "2ee62612485f888b731804ca1b3b18ed8e842b51" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Tue Dec 16 16:28:17 2008 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Dec 31 01:15:22 2008 -0500" }, "message": "ACPI: remove private acpica headers from driver files\n\nExternal driver files should not include any private acpica headers.\n\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "cbb2ed4ac61f3e3d1656db141cfced6ed38861d5", "tree": "75f41905b0ba5ae88e7d7e5278eb6523bd44e25d", "parents": [ "d014e5f7f817d8a5d65457c416ade9244785f196" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Sat Oct 18 20:25:46 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:50:24 2008 -0700" }, "message": "tpm: don\u0027t export static functions\n\nToday\u0027s linux-next build (powerpc_allyesconfig) failed like this:\n\ndrivers/char/tpm/tpm.c:1162: error: __ksymtab_tpm_dev_release causes a section type conflict\n\nCaused by commit 253115b71fa06330bd58afbe01ccaf763a8a0cf1 (\"The\ntpm_dev_release function is only called for platform devices, not pnp\")\nwhich exported a static function.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd78c9439fc1e031835bccb934d27b978c72c536", "tree": "003eb90233367defab682643dc1cc143a302dc68", "parents": [ "63a10dfdda0e2262f5b61b54b6d9b1747a87ff54" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Oct 15 22:04:37 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 16 11:21:49 2008 -0700" }, "message": "drivers/char/tpm/tpm.c: fix error-path memory leak\n\ntpm_register_hardware() leaks devname on an error path.\n\nAddresses http://bugzilla.kernel.org/show_bug.cgi?id\u003d11425\n\nReported-by: Daniel Marjamki \u003cdanielm77@spray.se\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "292cf4a8a989cb564a6a5f0ba7a66e08a095afa1", "tree": "6db1701350102a4ee9aa19aac366e166db475a48", "parents": [ "9e5b1b12226d5a501fbc6706ca090e00d18a01ad" ], "author": { "name": "Valdis Kletnieks", "email": "valdis.kletnieks@vt.edu", "time": "Wed Oct 15 22:04:35 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 16 11:21:49 2008 -0700" }, "message": "tpm: work around bug in Broadcom BCM0102 chipset\n\nPatch tpm-correct-tpm-timeouts-to-jiffies-conversion reveals a bug in the\nBroadcom BCM0102 TPM chipset used in the Dell Latitude D820 - although\nmost of the timeouts are returned in usecs as per the spec, one is\napparently returned in msecs, which results in a too-small value leading\nto a timeout when the code treats it as usecs. To prevent a regression,\nwe check for the known too-short value and adjust it to a value that makes\nthings work.\n\nSigned-off-by: Valdis Kletnieks \u003cvaldis.kletnieks@vt.edu\u003e\nCc: Marcin Obara \u003cmarcin_obara@users.sourceforge.net\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nCc: Kylene Jo Hall \u003ckjhall@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9e5b1b12226d5a501fbc6706ca090e00d18a01ad", "tree": "4d2a7b40739e94e15b3bb525043abb0689b4d4cd", "parents": [ "612de10db06c0704a66bbe7fd13990cb1c2cb958" ], "author": { "name": "Marcin Obara", "email": "marcin_obara@users.sourceforge.net", "time": "Wed Oct 15 22:04:34 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 16 11:21:49 2008 -0700" }, "message": "tpm: correct tpm timeouts to jiffies conversion\n\nThis patch fixes timeouts conversion to jiffies, by replacing\nmsecs_to_jiffies() calls with usecs_to_jiffies(). According to TCG TPM\nSpecification Version 1.2 Revision 103 (pages 166, 167) TPM timeouts and\ndurations are returned in microseconds (usec) not in miliseconds (msec).\n\nThis fixes a long hang while loading TPM driver, if TPM chip starts in\n\"Idle\" state instead of \"Ready\" state. Without this patch - \u0027modprobe\u0027\nmay hang for 30 seconds or more.\n\nSigned-off-by: Marcin Obara \u003cmarcin_obara@users.sourceforge.net\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nCc: Kylene Jo Hall \u003ckjhall@us.ibm.com\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4bdec11f560b8f405a011288a50e65b1a81b3654", "tree": "92a8ad51fd1fa3a8dd4d2638cd6b20974cd0b15e", "parents": [ "15c220d003f7914aab99cdb71cd7834a0c9b4557" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Sat Oct 11 09:05:20 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Sat Oct 11 09:05:20 2008 +1100" }, "message": "As pointed out by Jonathan Corbet, the timer must be deleted before\nflushing the work queue in order to avoid a job being submitted after the\nchip had been released.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nCc: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nCc: \"Serge E. Hallyn\" \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "253115b71fa06330bd58afbe01ccaf763a8a0cf1", "tree": "5b2ce62ca88fa461f7d3466361b8c4599ea82ea0", "parents": [ "f02a93645e6200a9da0f26dac8ced28c612f5e86" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Sat Oct 11 09:04:39 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Sat Oct 11 09:04:39 2008 +1100" }, "message": "The tpm_dev_release function is only called for platform devices, not pnp\ndevices, so we implemented the .remove function for pnp ones. Since it\u0027s\ncode is very similar to the one inside tpm_dev_release, we\u0027ve created a\nhelper function tpm_dev_vendor_release, which is called by both.\n\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: \"Serge E. Hallyn\" \u003cserue@us.ibm.com\u003e\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f02a93645e6200a9da0f26dac8ced28c612f5e86", "tree": "2fc93ca32c93f6f91af1efefa2e8c103f65931f1", "parents": [ "dc36d32cc5bea5e985294c79995e10a159c3019a" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Sat Oct 11 09:04:23 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Sat Oct 11 09:04:23 2008 +1100" }, "message": "Protect tpm_chip_list when transversing it.\n\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "dc36d32cc5bea5e985294c79995e10a159c3019a", "tree": "0eb2fb1c0127cab4275a70ef1b22fc3f22fe716a", "parents": [ "f89c5edb86abfac4c914f4eb808b07684164eca0" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Sat Oct 11 09:04:02 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Sat Oct 11 09:04:02 2008 +1100" }, "message": "Renames num_open to is_open, as only one process can open the file at a time.\n\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: \"Serge E. Hallyn\" \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f89c5edb86abfac4c914f4eb808b07684164eca0", "tree": "aaaf692aa2c6a3daf9e32c2c4ec337526cd3809d", "parents": [ "b922df7383749a1c0b7ea64c50fa839263d3816b" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Sat Oct 11 09:03:39 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Sat Oct 11 09:03:39 2008 +1100" }, "message": "Remove the BKL calls from the TPM driver, which were added in the overall\nmisc-char-dev-BKL-pushdown.patch, as they are not needed.\n\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: \"Serge E. Hallyn\" \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "da31894ed7b654e2e1741e7ac4ef6c15be0dd14b", "tree": "7247357082b105a4aab13a2fb7dad73886f1a9e5", "parents": [ "86d688984deefa3ae5a802880c11f2b408b5d6cf" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Fri Aug 22 11:35:57 2008 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Aug 28 10:47:42 2008 +1000" }, "message": "securityfs: do not depend on CONFIG_SECURITY\n\nAdd a new Kconfig option SECURITYFS which will build securityfs support\nbut does not require CONFIG_SECURITY. The only current user of\nsecurityfs does not depend on CONFIG_SECURITY and there is no reason the\nfull LSM needs to be built to build this fs.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "0147600172b4a5d261165d1aa5ef818d84da1557", "tree": "600b372bdde87472043d71716a8cfe638a91373b", "parents": [ "ec288bd37e1925f513db40871bc46115cf7fb733" ], "author": { "name": "Michael Halcrow", "email": "mhalcrow@us.ibm.com", "time": "Fri Jul 25 19:45:00 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 26 12:00:04 2008 -0700" }, "message": "tpm: Use correct data types for sizes in tpm_write() and tpm_read()\n\nUse the correct data types for the size parameters in tpm_write() and\ntpm_read(). Note that rw_verify_area() makes sure that this bug cannot\nbe exploited to produce a buffer overrun.\n\nSigned-off-by: Michael Halcrow \u003cmhalcrow@us.ibm.com\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ec288bd37e1925f513db40871bc46115cf7fb733", "tree": "92ae4c361a0238ac5d117e148d6ae03a3759090d", "parents": [ "3bd60464e3224820bc413c45ea2cc371edc63e9d" ], "author": { "name": "Marcin Obara", "email": "marcin_obara@users.sourceforge.net", "time": "Fri Jul 25 19:44:59 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 26 12:00:04 2008 -0700" }, "message": "tpm: increase size of internal TPM response buffers\n\nThis patch increases size of driver internal response buffers. Some TPM\nresponses defined in TCG TPM Specification Version 1.2 Revision 103 have\nincreased size and do not fit previously defined buffers. Some TPM\nresponses do not have fixed size, so bigger response buffers have to be\nallocated. 200B buffers should be enough.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Marcin Obara \u003cmarcin_obara@users.sourceforge.net\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nCc: Kylene Jo Hall \u003ckjhall@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3bd60464e3224820bc413c45ea2cc371edc63e9d", "tree": "883887ad0e1803e036998024d87855be04b997bb", "parents": [ "061991ec6edceda48d60f7a53e17b8d3416266ae" ], "author": { "name": "Adrian Bunk", "email": "bunk@kernel.org", "time": "Fri Jul 25 19:44:58 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 26 12:00:04 2008 -0700" }, "message": "tpm_bios.c: make 2 structs static\n\nThis patch makes two needlessly global structs static.\n\nSigned-off-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nAcked-by: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "061991ec6edceda48d60f7a53e17b8d3416266ae", "tree": "9d0c9640bfb9c924570a5a0ec57b15114832a6b7", "parents": [ "adbd321a17ccdd26752b57e68ab0a97a4aebc299" ], "author": { "name": "LE DISEZ Erwan", "email": "eledisez@grounation.org", "time": "Fri Jul 25 19:44:56 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 26 12:00:03 2008 -0700" }, "message": "tpm: add support for Broadcom TPM TIS device HID\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2fceef397f9880b212a74c418290ce69e7ac00eb", "tree": "d9cc09ab992825ef7fede4a688103503e3caf655", "parents": [ "feae1ef116ed381625d3731c5ae4f4ebcb3fa302", "bce7f793daec3e65ec5c5705d2457b81fe7b5725" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Mon Jul 14 15:29:34 2008 -0600" }, "committer": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Mon Jul 14 15:29:34 2008 -0600" }, "message": "Merge commit \u0027v2.6.26\u0027 into bkl-removal\n" }, { "commit": "fb0e7e11d017beb5f0b1fa25bc51e49e65c46d67", "tree": "b2f4eb4223132e9d91de8a930311a775f17b3f25", "parents": [ "e5a5816f7875207cb0a0a7032e39a4686c5e10a4" ], "author": { "name": "Marcin Obara", "email": "marcin_obara@users.sourceforge.net", "time": "Thu Jul 10 17:30:42 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 10 18:04:43 2008 -0700" }, "message": "tpm: add Intel TPM TIS device HID\n\nThis patch adds Intel TPM TIS device HID: ICO0102\n\nSigned-off-by: Marcin Obara \u003cmarcin_obara@users.sourceforge.net\u003e\nAcked-by: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "25368ca579905efe7f7dda43c252eb7b371de98c", "tree": "084b749627c5087456b26bcb85b48017f5dbf38c", "parents": [ "09de36137c3794786bc75682c0e1ce45182c1772" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 20 19:16:51 2008 +0200" }, "committer": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Wed Jul 02 15:06:25 2008 -0600" }, "message": "tpm-tpm: BKL pushdown\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "cedb27de0450fef73bc7dc28431d1108af54134c", "tree": "60f94098f7eb8b27f3525b894c2babb9687f200a", "parents": [ "4821cd111d1dbe4bf230a3ecd7f8d3e803f1eec3" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Tue Apr 29 01:03:25 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 29 08:06:26 2008 -0700" }, "message": "tpm: change Kconfig dependencies from PNPACPI to PNP\n\nThere is no \"PNPACPI\" driver interface as such. PNPACPI is an internal\nbackend of PNP, and drivers just use the generic PNP interface.\n\nThe drivers should depend on CONFIG_PNP, not CONFIG_PNPACPI.\n\ntpm_nsc.c doesn\u0027t use PNP at all, so we can just remove the dependency\ncompletely. It probably *should* use PNP to discover the device, but until it\ndoes, there\u0027s no point in depending on PNP.\n\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nCc: Kylene Jo Hall \u003ckjhall@us.ibm.com\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4821cd111d1dbe4bf230a3ecd7f8d3e803f1eec3", "tree": "321b0ba87026c301be659c35bba432ddfc9874ff", "parents": [ "f2b9a3962c69754e8eeb3d578bb33fdb1cf97cca" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Tue Apr 29 01:03:23 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 29 08:06:26 2008 -0700" }, "message": "tpm: fix section mismatch warning\n\nFix following warning:\nWARNING: vmlinux.o(.init.text+0x32804): Section mismatch in reference from the function init_nsc() to the function .devexit.text:tpm_nsc_remove()\n\nThe function tpm_nsc_remove() are used outside __exit, so remove the __exit\nannotation to make sure the function is always avilable.\n\nNote: Trying to compare this module with other users of platform_device gve me\nthe impression that this driver needs some work to match other users.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Kylene Hall \u003ckjhall@us.ibm.com\u003e\nCc: Marcel Selhorst \u003ctpm@selhorst.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "a6f97b293b08877d945ea3f28926aa446dd7ca2e" }