)]}' { "log": [ { "commit": "590dfe2f3bbbbeee806ee91bef68ba2a6afc16d2", "tree": "133e0085397d104d5a4bad8cd8afed3df6f17138", "parents": [ "c8fe74ae9a7285767cda1a053cfe806d67f77227" ], "author": { "name": "Michal Kubecek", "email": "mkubecek@suse.cz", "time": "Wed Jan 25 16:51:05 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 26 18:36:48 2012 +0000" }, "message": "agp: fix scratch page cleanup\n\nIn error cleanup of agp_backend_initialize() and in agp_backend_cleanup(),\nagp_destroy_page() is passed virtual address of the scratch page. This\nleads to a kernel warning if the initialization fails (or upon regular\ncleanup) as pointer to struct page should be passed instead.\n\nSigned-off-by: Michal Kubecek \u003cmkubecek@suse.cz\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "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": "c2bc3a316a7281f67e36b34dac2802cbe36a9128", "tree": "53e0b78ac25109b71c47bf47f4cdbb35ef1e7e36", "parents": [ "5674124f9f16f196533abb383193bd232c9afc2f", "2dac8e54f988ab58525505d7ef982493374433c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:23:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:23:09 2012 -0800" }, "message": "Merge branch \u0027x86/rdrand\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86/rdrand\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n random: Adjust the number of loops when initializing\n random: Use arch-specific RNG to initialize the entropy store\n" }, { "commit": "2dac8e54f988ab58525505d7ef982493374433c3", "tree": "a36ddf3790f984c8331b6d44bc1baa0f08c6a842", "parents": [ "3e88bdff1c65145f7ba297ccec69c774afe4c785" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:23:29 2012 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:33:49 2012 -0800" }, "message": "random: Adjust the number of loops when initializing\n\nWhen we are initializing using arch_get_random_long() we only need to\nloop enough times to touch all the bytes in the buffer; using\npoolwords for that does twice the number of operations necessary on a\n64-bit machine, since in the random number generator code \"word\" means\n32 bits.\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nLink: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu\n" }, { "commit": "3e88bdff1c65145f7ba297ccec69c774afe4c785", "tree": "2d01752cdd8a5b3f1cbcad3e0ef55d6f02696efd", "parents": [ "cf833d0b9937874b50ef2867c4e8badfd64948ce" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Thu Dec 22 16:28:01 2011 -0500" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:18:21 2012 -0800" }, "message": "random: Use arch-specific RNG to initialize the entropy store\n\nIf there is an architecture-specific random number generator (such as\nRDRAND for Intel architectures), use it to initialize /dev/random\u0027s\nentropy stores. Even in the worst case, if RDRAND is something like\nAES(NSA_KEY, counter++), it won\u0027t hurt, and it will definitely help\nagainst any other adversaries.\n\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nLink: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "tree": "a112335f2b2b2a51e90531c6c67e8a3b54dcf0ef", "parents": [ "0b48d42235caf627121f440b57d376f48a9af8b6", "72db395ffadb1d33233fd123c2bf87ba0198c6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nAutogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n module_param: check that bool parameters really are bool.\n intelfbdrv.c: bailearly is an int module_param\n paride/pcd: fix bool verbose module parameter.\n module_param: make bool parameters really bool (drivers \u0026 misc)\n module_param: make bool parameters really bool (arch)\n module_param: make bool parameters really bool (core code)\n kernel/async: remove redundant declaration.\n printk: fix unnecessary module_param_name.\n lirc_parallel: fix module parameter description.\n module_param: avoid bool abuse, add bint for special cases.\n module_param: check type correctness for module_param_array\n modpost: use linker section to generate table.\n modpost: use a table rather than a giant if/else statement.\n modules: sysfs - export: taint, coresize, initsize\n kernel/params: replace DEBUGP with pr_debug\n module: replace DEBUGP with pr_debug\n module: struct module_ref should contains long fields\n module: Fix performance regression on modules with large symbol tables\n module: Add comments describing how the \"strmap\" logic works\n\nFix up conflicts in scripts/mod/file2alias.c due to the new linker-\ngenerated table approach to adding __mod_*_device_table entries. The\nARM sa11x0 mcp bus needed to be converted to that too.\n" }, { "commit": "099469502f62fbe0d7e4f0b83a2f22538367f734", "tree": "5229c3818b2e6e09d35026d49314047121130536", "parents": [ "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "35f1526845a9d804206883e19bd257d3dcef758f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb, take two\")\n\nAndrew explains:\n\n - various misc stuff\n\n - Most of the rest of MM: memcg, threaded hugepages, others.\n\n - cpumask\n\n - kexec\n\n - kdump\n\n - some direct-io performance tweaking\n\n - radix-tree optimisations\n\n - new selftests code\n\n A note on this: often people will develop a new userspace-visible\n feature and will develop userspace code to exercise/test that\n feature. Then they merge the patch and the selftest code dies.\n Sometimes we paste it into the changelog. Sometimes the code gets\n thrown into Documentation/(!).\n\n This saddens me. So this patch creates a bare-bones framework which\n will henceforth allow me to ask people to include their test apps in\n the kernel tree so we can keep them alive. Then when people enhance\n or fix the feature, I can ask them to update the test app too.\n\n The infrastruture is terribly trivial at present - let\u0027s see how it\n evolves.\n\n - checkpoint/restart feature work.\n\n A note on this: this is a project by various mad Russians to perform\n c/r mainly from userspace, with various oddball helper code added\n into the kernel where the need is demonstrated.\n\n So rather than some large central lump of code, what we have is\n little bits and pieces popping up in various places which either\n expose something new or which permit something which is normally\n kernel-private to be modified.\n\n The overall project is an ongoing thing. I\u0027ve judged that the size\n and scope of the thing means that we\u0027re more likely to be successful\n with it if we integrate the support into mainline piecemeal rather\n than allowing it all to develop out-of-tree.\n\n However I\u0027m less confident than the developers that it will all\n eventually work! So what I\u0027m asking them to do is to wrap each piece\n of new code inside CONFIG_CHECKPOINT_RESTORE. So if it all\n eventually comes to tears and the project as a whole fails, it should\n be a simple matter to go through and delete all trace of it.\n\nThis lot pretty much wraps up the -rc1 merge for me.\n\n* akpm: (96 commits)\n unlzo: fix input buffer free\n ramoops: update parameters only after successful init\n ramoops: fix use of rounddown_pow_of_two()\n c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4\n c/r: introduce CHECKPOINT_RESTORE symbol\n selftests: new x86 breakpoints selftest\n selftests: new very basic kernel selftests directory\n radix_tree: take radix_tree_path off stack\n radix_tree: remove radix_tree_indirect_to_ptr()\n dio: optimize cache misses in the submission path\n vfs: cache request_queue in struct block_device\n fs/direct-io.c: calculate fs_count correctly in get_more_blocks()\n drivers/parport/parport_pc.c: fix warnings\n panic: don\u0027t print redundant backtraces on oops\n sysctl: add the kernel.ns_last_pid control\n kdump: add udev events for memory online/offline\n include/linux/crash_dump.h needs elf.h\n kdump: fix crash_kexec()/smp_send_stop() race in panic()\n kdump: crashk_res init check for /sys/kernel/kexec_crash_size\n ...\n" }, { "commit": "c755201eb5c1e09f3477d0e83ae1e3aadac0e8d1", "tree": "af48ca5cc4ef2173b64e421d7ad550dc10c437f0", "parents": [ "fdb5950754eb3dedb9fea7c8828d3e51d9dbc3f7" ], "author": { "name": "Kees Cook", "email": "kees@outflux.net", "time": "Thu Jan 12 17:20:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "ramoops: update parameters only after successful init\n\nIf a platform device exists on the system, but ramoops fails to attach to\nit, the module parameters are overridden before ramoops can fall back and\ntry to use passed module parameters. Move update to end of init routine.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Sergiu Iordache \u003csergiu@chromium.org\u003e\nCc: Seiji Aguchi \u003cseiji.aguchi@hds.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fdb5950754eb3dedb9fea7c8828d3e51d9dbc3f7", "tree": "57d9804de982ab233c2fe2c553466a12387e1866", "parents": [ "028ee4be34a09a6d48bdf30ab991ae933a7bc036" ], "author": { "name": "Marco Stornelli", "email": "marco.stornelli@gmail.com", "time": "Thu Jan 12 17:20:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "ramoops: fix use of rounddown_pow_of_two()\n\nThe return value of rounddown_pow_of_two wasn\u0027t evaluated, so the\noperation was a no-op.\n\nSigned-off-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@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": "a3dd3323058d281abd584b15ad4c5b65064d7a61", "tree": "98c65337f9960db2d0ca55687314bb821f3e7c1f", "parents": [ "9512938b885304f72c847379611d6018064af840" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 12 17:20:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kexec: remove KMSG_DUMP_KEXEC\n\nKMSG_DUMP_KEXEC is useless because we already save kernel messages inside\n/proc/vmcore, and it is unsafe to allow modules to do other stuffs in a\ncrash dump scenario.\n\n[akpm@linux-foundation.org: fix powerpc build]\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nReported-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\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": "bcf8a3dfcb274cf6654a19e12e244f3af8c0d355", "tree": "f1d0e0f36c0575a9202750aff65ba17ce91bc437", "parents": [ "61bd5e5683244a564ecfe31c73575ee0bc708ccc", "b6c96c0214138186f495e3ee73737c6fc5e4efa2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "message": "Merge tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux\n\n* tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux: (24 commits)\n lguest: Make sure interrupt is allocated ok by lguest_setup_irq\n lguest: move the lguest tool to the tools directory\n lguest: switch segment-voodoo-numbers to readable symbols\n virtio: balloon: Add freeze, restore handlers to support S4\n virtio: balloon: Move vq initialization into separate function\n virtio: net: Add freeze, restore handlers to support S4\n virtio: net: Move vq and vq buf removal into separate function\n virtio: net: Move vq initialization into separate function\n virtio: blk: Add freeze, restore handlers to support S4\n virtio: blk: Move vq initialization to separate function\n virtio: console: Disable callbacks for virtqueues at start of S4 freeze\n virtio: console: Add freeze and restore handlers to support S4\n virtio: console: Move vq and vq buf removal into separate functions\n virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff\n virtio: pci: switch to new PM API\n virtio_blk: fix config handler race\n virtio: add debugging if driver doesn\u0027t kick.\n virtio: expose added descriptors immediately.\n virtio: avoid modulus operation.\n virtio: support unlocked queue kick\n ...\n" }, { "commit": "c743d09dbd018dd6345519fb3264b16bdaa41746", "tree": "acf5eabccb93d35035547fd80489f222a1538256", "parents": [ "2b8f41d846990c3c1c8addbaed2cf53c3ef91d25" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Fri Jan 06 16:19:08 2012 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:45 2012 +1030" }, "message": "virtio: console: Disable callbacks for virtqueues at start of S4 freeze\n\nTo ensure we don\u0027t receive any more interrupts from the host after we\nenter the freeze function, disable all vq interrupts.\n\nThere wasn\u0027t any problem seen due to this in tests, but applying this\npatch makes the freeze case more robust.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "2b8f41d846990c3c1c8addbaed2cf53c3ef91d25", "tree": "a3dbf456eb359650db0487d66d3594f1fa7be6c0", "parents": [ "a0e2dbfc223028b72a1c193f94fcd3f67253ba4a" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu Dec 22 16:58:28 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:45 2012 +1030" }, "message": "virtio: console: Add freeze and restore handlers to support S4\n\nRemove all vqs and associated buffers in the freeze callback which\nprepares us to go into hibernation state. On restore, re-create all the\nvqs and populate the input vqs with buffers to get to the pre-hibernate\nstate.\n\nNote: Any outstanding unconsumed buffers are discarded; which means\nthere\u0027s a possibility of data loss in case the host or the guest didn\u0027t\nconsume any data already present in the vqs. This can be addressed in a\nlater patch series, perhaps in virtio common code.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a0e2dbfc223028b72a1c193f94fcd3f67253ba4a", "tree": "9995e923c960f0e8e1315f595336597f627e9c96", "parents": [ "f0fe6f11503fa9880867554350ac5d3092c47251" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu Dec 22 16:58:27 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:45 2012 +1030" }, "message": "virtio: console: Move vq and vq buf removal into separate functions\n\nThis common code will be shared with the PM freeze function.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "f96fde41f7f9af6cf20f6a1919f5d9670f84d574", "tree": "14b8a0343b255989ac8ba0ea34e18dca419723df", "parents": [ "5dfc17628d57f9e62043ed0cba03a6e3eb019a78" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:42 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:42 2012 +1030" }, "message": "virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf\n\nRemove wrapper functions. This makes the allocation type explicit in\nall callers; I used GPF_KERNEL where it seemed obvious, left it at\nGFP_ATOMIC otherwise.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "4f58cb90bcb04cfe18f524d1c9a65edef5eb3f51", "tree": "8c686e8b736eed7258921909282c0955543c7d2f", "parents": [ "e7691a1ce341c80ed9504244a36b31c025217391", "08c70fc3a239475122e20b7a21dfae4c264c24f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 22:01:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 22:01:27 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (54 commits)\n crypto: gf128mul - remove leftover \"(EXPERIMENTAL)\" in Kconfig\n crypto: serpent-sse2 - remove unneeded LRW/XTS #ifdefs\n crypto: serpent-sse2 - select LRW and XTS\n crypto: twofish-x86_64-3way - remove unneeded LRW/XTS #ifdefs\n crypto: twofish-x86_64-3way - select LRW and XTS\n crypto: xts - remove dependency on EXPERIMENTAL\n crypto: lrw - remove dependency on EXPERIMENTAL\n crypto: picoxcell - fix boolean and / or confusion\n crypto: caam - remove DECO access initialization code\n crypto: caam - fix polarity of \"propagate error\" logic\n crypto: caam - more desc.h cleanups\n crypto: caam - desc.h - convert spaces to tabs\n crypto: talitos - convert talitos_error to struct device\n crypto: talitos - remove NO_IRQ references\n crypto: talitos - fix bad kfree\n crypto: convert drivers/crypto/* to use module_platform_driver()\n char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver()\n crypto: serpent-sse2 - should select CRYPTO_CRYPTD\n crypto: serpent - rename serpent.c to serpent_generic.c\n crypto: serpent - cleanup checkpatch errors and warnings\n ...\n" }, { "commit": "e7691a1ce341c80ed9504244a36b31c025217391", "tree": "e9941bb350f64a726130e299c411821da6f41a53", "parents": [ "5cd9599bba428762025db6027764f1c59d0b1e1b", "8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 21:51:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 21:51:23 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security: (32 commits)\n ima: fix invalid memory reference\n ima: free duplicate measurement memory\n security: update security_file_mmap() docs\n selinux: Casting (void *) value returned by kmalloc is useless\n apparmor: fix module parameter handling\n Security: tomoyo: add .gitignore file\n tomoyo: add missing rcu_dereference()\n apparmor: add missing rcu_dereference()\n evm: prevent racing during tfm allocation\n evm: key must be set once during initialization\n mpi/mpi-mpow: NULL dereference on allocation failure\n digsig: build dependency fix\n KEYS: Give key types their own lockdep class for key-\u003esem\n TPM: fix transmit_cmd error logic\n TPM: NSC and TIS drivers X86 dependency fix\n TPM: Export wait_for_stat for other vendor specific drivers\n TPM: Use vendor specific function for status probe\n tpm_tis: add delay after aborting command\n tpm_tis: Check return code from getting timeouts/durations\n tpm: Introduce function to poll for result of self test\n ...\n\nFix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI\nand SIGSIG next to CONFIG_DQL addition.\n" }, { "commit": "1a464cbb3d483f2f195b614cffa4aa1b910a0440", "tree": "af57dee6436532dbb546b8670e9e1f6910d489b5", "parents": [ "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "095f979a539245a46b9e5d600ec9c720b4d928e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (307 commits)\n drm/nouveau/pm: fix build with HWMON off\n gma500: silence gcc warnings in mid_get_vbt_data()\n drm/ttm: fix condition (and vs or)\n drm/radeon: double lock typo in radeon_vm_bo_rmv()\n drm/radeon: use after free in radeon_vm_bo_add()\n drm/sis|via: don\u0027t return stack garbage from free_mem ioctl\n drm/radeon/kms: remove pointless CS flags priority struct\n drm/radeon/kms: check if vm is supported in VA ioctl\n drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n radeon: Fix disabling PCI bus mastering on big endian hosts.\n ttm: fix agp since ttm tt rework\n agp: Fix multi-line warning message whitespace\n drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don\u0027t try to free freed pages.\n drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.\n drm/radeon/kms: sync across multiple rings when doing bo moves v3\n drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)\n drm/radeon: GPU virtual memory support v22\n drm: make DRM_UNLOCKED ioctls with their own mutex\n drm: no need to hold global mutex for static data\n drm/radeon/benchmark: common modes sweep ignores 640x480@32\n ...\n\nFix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c\n" }, { "commit": "8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8", "tree": "a118eaef15d4ba22247f45ee01537ecc906cd161", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 09 12:16:48 2012 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 09 12:16:48 2012 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n\nConflicts:\n\tsecurity/integrity/evm/evm_crypto.c\n\nResolved upstream fix vs. next conflict manually.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "d3d0b024348c040f0d6851e2e59fc961677d5169", "tree": "ab018edaa027ad069c54beb9cb3d0c5b5efc2198", "parents": [ "6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd", "9d5c627323dcf0983d699d26dd486272fc98bef2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "message": "Merge branch \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:\n sound: aaci: Enable module alias autogeneration for AMBA drivers\n watchdog: sp805: Enable module alias autogeneration for AMBA drivers\n fbdev: amba: Enable module alias autogeneration for AMBA drivers\n serial: pl011: Enable module alias autogeneration for AMBA drivers\n serial: pl010: Enable module alias autogeneration for AMBA drivers\n spi: pl022: Enable module alias autogeneration for AMBA drivers\n rtc: pl031: Enable module alias autogeneration for AMBA drivers\n rtc: pl030: Enable module alias autogeneration for AMBA drivers\n mmc: mmci: Enable module alias autogeneration for AMBA drivers\n input: ambakmi: Enable module alias autogeneration for AMBA drivers\n gpio: pl061: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl330: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers\n hwrng: nomadik: Enable module alias autogeneration for AMBA drivers\n ARM: amba: Auto-generate AMBA driver module aliases during modpost\n ARM: amba: Move definition of struct amba_id to mod_devicetable.h\n" }, { "commit": "e11d0b87cde80745afe4712a19cd37bca9924a5b", "tree": "e1f39d515c45546d2c65088735fce529ce3d9cd1", "parents": [ "2c05114d23c4fd2256eaf5645528c19fcefdb2c8" ], "author": { "name": "Tormod Volden", "email": "debian.tormod@gmail.com", "time": "Fri Jan 06 00:16:26 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:32:02 2012 +0000" }, "message": "agp: Fix multi-line warning message whitespace\n\nSigned-off-by: Tormod Volden \u003cdebian.tormod@gmail.com\u003e\nReviewed-by: Corbin Simpson \u003cMostAwesomeDude@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2c9ede55ecec58099b72e4bb8eab719f32f72c31", "tree": "8498a8c940fea97931b469fc73eb1a5022a2b28c", "parents": [ "7d54fa6472609f2b0f2ea27e51ec2cf1fb27bd57" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jul 23 20:24:48 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:55 2012 -0500" }, "message": "switch device_get_devnode() and -\u003edevnode() to umode_t *\n\nboth callers of device_get_devnode() are only interested in lower 16bits\nand nobody tries to return anything wider than 16bit anyway.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "cf833d0b9937874b50ef2867c4e8badfd64948ce", "tree": "f2eb260e524387c6dce6de17b5c06ec0c34adef7", "parents": [ "5f0a6e2d503896062f641639dacfe5055c2f593b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 22 11:36:22 2011 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Dec 29 16:49:45 2011 -0800" }, "message": "random: Use arch_get_random_int instead of cycle counter if avail\n\nWe still don\u0027t use rdrand in /dev/random, which just seems stupid. We\naccept the *cycle*counter* as a random input, but we don\u0027t accept\nrdrand? That\u0027s just broken.\n\nSure, people can do things in user space (write to /dev/random, use\nrdrand in addition to /dev/random themselves etc etc), but that\n*still* seems to be a particularly stupid reason for saying \"we\nshouldn\u0027t bother to try to do better in /dev/random\".\n\nAnd even if somebody really doesn\u0027t trust rdrand as a source of random\nbytes, it seems singularly stupid to trust the cycle counter *more*.\n\nSo I\u0027d suggest the attached patch. I\u0027m not going to even bother\narguing that we should add more bits to the entropy estimate, because\nthat\u0027s not the point - I don\u0027t care if /dev/random fills up slowly or\nnot, I think it\u0027s just stupid to not use the bits we can get from\nrdrand and mix them into the strong randomness pool.\n\nLink: http://lkml.kernel.org/r/CA%2B55aFwn59N1\u003dm651QAyTy-1gO1noGbK18zwKDwvwqnravA84A@mail.gmail.com\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nAcked-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "b75d91f7ca513f0a4d0d1ad0942fb90cf5a2bc88", "tree": "3ed9062637e769ab8bd89748baf2b167244bbda8", "parents": [ "ff05b6f7ae762b6eb464183eec994b28ea09f6dd" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Mon Dec 19 17:12:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 10:25:04 2011 -0800" }, "message": "ipmi_watchdog: restore settings when BMC reset\n\nIf the BMC gets reset, it will return 0x80 response errors.\n\nIn less than a week\n# grep \"Error 80 on cmd 22\" /var/log/kernel |wc -l\n378681\n\nIn this case, it is probably a good idea to restore the IPMI settings.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nTested-by: Arkadiusz Miśkiewicz \u003ca.miskiewicz@gmail.com\u003e\nReported-by: Arkadiusz Miśkiewicz \u003ca.miskiewicz@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": "42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9", "tree": "6f8fb2a1efb3e84bf281658befe06dc6a7fb026b", "parents": [ "a13b032776379fa6e2bfccf798969ca51e5fb052" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Nov 28 20:31:00 2011 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 02 14:57:31 2011 +0100" }, "message": "treewide: Fix typos in various parts of the kernel, and fix some comments.\n\nThe below patch fixes some typos in various parts of the kernel, as well as fixes some comments.\nPlease let me know if I missed anything, and I will try to get it changed and resent.\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b21cb324f141d16833137ef0355f686efb9bd84f", "tree": "60295fb35826b75d870b3f273263262c135afdc6", "parents": [ "341975bf3af8f492f8e6ffc3d0fdf6f9c43e1691" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Nov 26 21:11:06 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Nov 30 16:12:47 2011 +0800" }, "message": "char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/char/hw_random/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Josh Boyer \u003cjwboyer@linux.vnet.ibm.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Alexander Clouter \u003calex@digriz.org.uk\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "4e3f3d53b8b5d597e36c075e01014e9019a44d55", "tree": "34c1677272898f9c26c0ae5a62b5be7e300e5e50", "parents": [ "523817bd22617cd62199ae4ca2a6f5e1aa250654" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Wed Oct 05 15:15:20 2011 +0100" }, "committer": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Tue Nov 22 10:58:30 2011 +0000" }, "message": "hwrng: nomadik: Enable module alias autogeneration for AMBA drivers\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\n" }, { "commit": "bd29e568a4cb6465f6e5ec7c1c1f3ae7d99cbec1", "tree": "1180a6d21950f2cd11992c724f5554c333dd2ee0", "parents": [ "869f8dfa52295e75e043af618e47305e4b109bc1" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Wed Nov 16 10:50:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 17 11:42:54 2011 -0200" }, "message": "fix typo/thinko in get_random_bytes()\n\nIf there is an architecture-specific random number generator we use it\nto acquire randomness one \"long\" at a time. We should put these random\nwords into consecutive words in the result buffer - not just overwrite\nthe first word again and again.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\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": "a08185a3eb658854b29c05bcbfac0f85038ffe9f", "tree": "9411bc4cd2dc3dd5e4f29654b7b32669fe1434bb", "parents": [ "35b09c9bf619c4fc6040c52dcea6bd5bd6af7679" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Oct 28 10:28:00 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:27 2011 +0000" }, "message": "agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set\n\nKernels with no iommu support cannot ever need the Ironlake\nwork-around, so never enable it in that case.\n\nMight be better to completely remove the work-around from the kernel\nin this case?\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n" }, { "commit": "35b09c9bf619c4fc6040c52dcea6bd5bd6af7679", "tree": "27e9ec49a947d0a267c716a732eae58ac2b856ee", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Oct 28 14:42:41 2011 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:18 2011 +0000" }, "message": "drm/i915: fix if statement (bogus semi-colon)\n\nThe semi-colon is a typo here and it makes the if statement\nunconditional.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "f7e801172c53c4dc48b1f888a72eae069be6333a", "tree": "61d5243a48fe3640dbace0222054fc88dd0c6612", "parents": [ "092f4c56c1927e4b61a41ee8055005f1cb437009", "6b1c70b1ff6f800f081a6bbef662789135f7b398" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:52:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:52:17 2011 -0700" }, "message": "Merge branch \u0027misc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027misc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n MAINTAINERS: Update entry for IA64\n [IA64] gpio: GENERIC_GPIO default must be n\n [IA64[ add CONFIG_NET_VENDOR_INTEL\u003dy to default config files where needed\n [IA64] agp/hp-agp: Allow binding user memory to the AGP GART\n [IA64] sn2: add missing put_cpu()\n" }, { "commit": "80c2861672bbf000f6af838656959ee937e4ee4d", "tree": "78b361fd7278d461b1e664272f3b27660b64c642", "parents": [ "d211858837ff8d8e31942ca7d27e6e08b3b46f5e", "5087a50e66bd51b6e72c60bce4757a42b93f6b2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-blk: use ida to allocate disk index\n virtio: Add platform bus driver for memory mapped virtio device\n virtio: Dont add \"config\" to list for !per_vq_vector\n virtio: console: wait for first console port for early console output\n virtio: console: add port stats for bytes received, sent and discarded\n virtio: console: make discard_port_data() use get_inbuf()\n virtio: console: rename variable\n virtio: console: make get_inbuf() return port-\u003einbuf if present\n virtio: console: Fix return type for get_inbuf()\n virtio: console: Use wait_event_freezable instead of _interruptible\n virtio: console: Ignore port name update request if name already set\n virtio: console: Fix indentation\n virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx\n virtio.h: correct comment for struct virtio_driver\n virtio-net: Use virtio_config_val() for retrieving config\n virtio_config: Add virtio_config_val_len()\n virtio-console: Use virtio_config_val() for retrieving config\n" }, { "commit": "de0a5345a55b8dd5a4695181275df0e691176830", "tree": "17530e824f7f46ce0b1757657179fb5957a6add5", "parents": [ "994c0e992522c123298b4a91b72f5e67ba2d1123", "8535639810e578960233ad39def3ac2157b0c3ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 09:45:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 09:45:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://github.com/richardweinberger/linux\n\n* \u0027for-linus\u0027 of git://github.com/richardweinberger/linux: (90 commits)\n um: fix ubd cow size\n um: Fix kmalloc argument order in um/vdso/vma.c\n um: switch to use of drivers/Kconfig\n UserModeLinux-HOWTO.txt: fix a typo\n UserModeLinux-HOWTO.txt: remove ^H characters\n um: we need sys/user.h only on i386\n um: merge delay_{32,64}.c\n um: distribute exports to where exported stuff is defined\n um: kill system-um.h\n um: generic ftrace.h will do...\n um: segment.h is x86-only and needed only there\n um: asm/pda.h is not needed anymore\n um: hw_irq.h can go generic as well\n um: switch to generic-y\n um: clean Kconfig up a bit\n um: a couple of missing dependencies...\n um: kill useless argument of free_chan() and free_one_chan()\n um: unify ptrace_user.h\n um: unify KSTK_...\n um: fix gcov build breakage\n ...\n" }, { "commit": "3369465ed1a6a9aa9b885a6d7d8e074ecbd782da", "tree": "ac60be76e1d363caab63156c1390f1ab0c4ee96c", "parents": [ "c039aff672a540f8976770e74599d350de1805cb" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Thu Aug 18 20:11:59 2011 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 14:15:41 2011 +0100" }, "message": "um: switch to use of drivers/Kconfig\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "d805a78603bb489d71a12466e8f29c5e9837e50a", "tree": "12d7273a3cbd4f28e833232e9d884b6c3b7f904e", "parents": [ "bad3118fcdeb4b7b5bf18cb40b2548cf891646b2" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Thu Aug 18 20:13:00 2011 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 14:15:29 2011 +0100" }, "message": "um: clean Kconfig up a bit\n\n* kill duplicates with drivers/char/Kconfig\n* take watchdog one into drivers/watchdog/Kconfig\n* take mmapper to arch/um/Kconfig.um\n* rename Kconfig.char menu to \"UML Character Devices\"\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "25498e5b3df931a3d52a6e0642ae242e4ee19488", "tree": "5a627d71015fde644d8c61a04f7718c2f0a748db", "parents": [ "952414505f55afe5cd6dc004765076aa22b3ed7e", "995a0605a6665858d73f9e80053414909be33f27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:16:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:16:43 2011 -0700" }, "message": "Merge branch \u0027next/driver\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/driver\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n hw_random: add driver for atmel true hardware random number generator\n ARM: at91: at91sam9g45: add trng clock and platform device\n MX53 Enable the AHCI SATA on MX53 SMD board\n MX53 Enable the AHCI SATA on MX53 LOCO board\n MX53 Enable the AHCI SATA on MX53 ARD board\n AHCI Add the AHCI SATA feature on the MX53 platforms\n Fix pata imx resource\n ARM: imx: Define functions for registering PATA\n ARM: imx: Add PATA clock support\n ARM: imx: Add PATA resources for other i.MX processors\n imx: efika: Enable pata.\n imx51: add pata clock\n imx51: add pata device\n\nFix up trivial conflict (new selects next to each other from separate\nbranches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig\n" }, { "commit": "5e38483b350405542c8080134408fd8897394ba2", "tree": "34d746dadbec16fd33e4f08cf90561ee62a3014e", "parents": [ "17e5b4f20adbe286fdf14b4d08f296564e97e545" ], "author": { "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com", "time": "Thu Sep 22 23:44:23 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:01 2011 +1030" }, "message": "virtio: console: wait for first console port for early console output\n\nOn s390 I have seen some random\n\n\"Warning: unable to open an initial console\"\n\nboot failure. Turns out that tty_open fails, because the\nhvc_alloc was not yet done. In former times this could not happen,\nsince the probe function automatically called hvc_alloc. With newer\nversions (multiport) some host\u003c-\u003eguest interaction is required\nbefore hvc_alloc is called. This might be too late, especially if\nan initramfs is involved. Lets use a completion if we have\nmultiport and an early console.\n\n[Amit:\n * Use NULL instead of 0 for pointer comparison\n * Rename \u0027port_added\u0027 to \u0027early_console_added\u0027\n * Re-format, re-word commit message\n * Rebase patch on top of current queue]\n\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nAcked-by: Chrstian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "17e5b4f20adbe286fdf14b4d08f296564e97e545", "tree": "c6634147e4a939213033cf8f5b622a686edd3968", "parents": [ "2d24cdaa6e389f85dad51eda39f1c2684a4f15b0" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:46 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:01 2011 +1030" }, "message": "virtio: console: add port stats for bytes received, sent and discarded\n\nThis commit adds port-specific stats for the number of bytes received,\nsent and discarded. They\u0027re exposed via the debugfs interface. This\ndata can be used to check for data loss bugs (or disprove such claims).\nIt can also be used for accounting, if there\u0027s such a need.\n\nThe stats remain valid throughout the lifetime of the port. Unplugging\na port will reset the stats. The numbers are not reset across port\nopens/closes.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "2d24cdaa6e389f85dad51eda39f1c2684a4f15b0", "tree": "88f02e92c459fa8d768c1ae6fbcfa8a4ccfcdc0e", "parents": [ "ce072a0cee420782ed0a079ac17c7ca26056fb95" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:45 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: make discard_port_data() use get_inbuf()\n\ndiscard_port_data() used virtqueue_get_buf() directly instead of using\nget_inbuf(). Fix this, so that we get accounting for all received\nbytes. This also simplifies the code a lot.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "ce072a0cee420782ed0a079ac17c7ca26056fb95", "tree": "678f0850a3a1fbeee88fb9e1d395141f8b61ac09", "parents": [ "d25a9ddae93ca97aa03fdab1363baf0e0c35d960" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:44 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: rename variable\n\n\u0027ret\u0027 is a misnomer in discard_port_data() since we don\u0027t return the\nvalue. Rename it to \u0027err\u0027.\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "d25a9ddae93ca97aa03fdab1363baf0e0c35d960", "tree": "fea9bd4041716248fdfd8db78bab715f1d907670", "parents": [ "defde66996476295dc7b1b60ea318965f8c3ad86" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:43 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: make get_inbuf() return port-\u003einbuf if present\n\nInstead of pulling in a buffer from the vq each time it\u0027s called,\nget_inbuf() now checks if the current active buffer, in port-\u003einbuf is\nvalid. If it is, just returns a pointer to it. This ends up\nsimplifying a lot of code calling get_inbuf() since the check for\nport-\u003einbuf being valid was done by all the callers.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "defde66996476295dc7b1b60ea318965f8c3ad86", "tree": "8dcf44f08a9287dec917e36808867e7943ea0b01", "parents": [ "a08fa92d16f2fa112e3400c6c513d23ae78b960a" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:42 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: Fix return type for get_inbuf()\n\nget_inbuf() returns void *. There\u0027s no reason to return void pointers\ninstead of the correct struct port_buffer *.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a08fa92d16f2fa112e3400c6c513d23ae78b960a", "tree": "045c57551c2193a6d387231938e7426eaa450faf", "parents": [ "291024ef351328e7b4ca6bae798abc816a43653c" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:41 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: Use wait_event_freezable instead of _interruptible\n\nGet ready to support suspend/resume by using the freezable calls so that\nblocking read/write syscalls are handled properly across suspend/resume.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "291024ef351328e7b4ca6bae798abc816a43653c", "tree": "da54013a26d70be3136266692eea6ac95077f865", "parents": [ "286f9a226f11e4a05d08999417fd838c0ca91d7a" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:40 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:59 2011 +1030" }, "message": "virtio: console: Ignore port name update request if name already set\n\nWe don\u0027t allow port name changes dynamically for a port. So any\nrequests by the host to change the name are ignored.\n\nBefore this patch, if the hypervisor sent a port name while we had one\nset already, we would leak memory equivalent to the size of the old\nname.\n\nThis scenario wasn\u0027t expected so far, but with the suspend-resume\nsupport, we\u0027ll send the VIRTIO_CONSOLE_PORT_READY message after restore,\nwhich can get us into this situation.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "286f9a226f11e4a05d08999417fd838c0ca91d7a", "tree": "35f5e084944e6c7bf4db4dc6b048de1d2d372bc7", "parents": [ "00b894e874581f6b388c5817d4d5546c22cf9640" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:39 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:59 2011 +1030" }, "message": "virtio: console: Fix indentation\n\nConvert spaces to tabs and fix indentation for an if statement split\ninto multiple lines.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "51c6d61ac58844b5e3e0d28271084c06f6a15371", "tree": "d98c755facff356cfcf1205c5e5315f23379c58e", "parents": [ "b4beb4bf9934d151bf4581a54ae028927374cb2a" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Sun Aug 14 17:52:31 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:58 2011 +1030" }, "message": "virtio-console: Use virtio_config_val() for retrieving config\n\nThis patch modifies virtio-console to use virtio_config_val() instead\nof a \u0027if(virtio_has_feature()) vdev-\u003econfig-\u003eget()\u0027 construct to retrieve\noptional values from the config space.\n\nCc: Amit Shah \u003camit.shah@redhat.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: virtualization@lists.linux-foundation.org\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "c05aa8fbcc21b1863085dde5cb3c97b32c52ce40", "tree": "1488a18dc5ad8e7e911dbd61e853fba5b4e4a66d", "parents": [ "66300e66c680f7bcc43127627740f493ef0b05bc" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Jul 27 21:31:17 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:42 2011 -0400" }, "message": "drivers/char: Fix implicit use of err.h in ramoops.c\n\ndrivers/char/ramoops.c: In function \u0027ramoops_init\u0027:\ndrivers/char/ramoops.c:221: error: implicit declaration of function \u0027IS_ERR\u0027\ndrivers/char/ramoops.c:222: error: implicit declaration of function \u0027PTR_ERR\u0027\nmake[3]: *** [drivers/char/ramoops.o] Error 1\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "66300e66c680f7bcc43127627740f493ef0b05bc", "tree": "8f0e92c40063be1edf6727e5e9b09adb9102b5c7", "parents": [ "c22405c98d3ff7042e369370d2bf54f9607d0f09" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 10 12:14:53 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:41 2011 -0400" }, "message": "drivers/char: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required\n\nThey will need it called out explicitly in the near future due\nto a module.h usage cleanup that removes its implicit presence\neverywhere.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "c22405c98d3ff7042e369370d2bf54f9607d0f09", "tree": "d9eae01697a87fd4eda1c8a31ff4fcdfc00f9432", "parents": [ "aaf195444be47aa3d3776825b3b384a61f40dca4" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 03 13:35:48 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:40 2011 -0400" }, "message": "drivers/char: Add module.h to those who were using it implicitly\n\nA pending cleanup will mean that module.h won\u0027t be implicitly\neverywhere anymore. Make sure the modular drivers in char are\nactually calling out for \u003cmodule.h\u003e explicitly in advance.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "37be944a0270402f9cda291a930b0286f6dc92f5", "tree": "6a91a9eb86450f4a18a8871f04a1ef810e7b55d6", "parents": [ "ca836a25435ef1b9914840ed0a310c9b6ac261d1", "1717c0e23f411147490c7a3312b894f0ea9a5fb1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:54:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:54:23 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (290 commits)\n Revert \"drm/ttm: add a way to bo_wait for either the last read or last write\"\n Revert \"drm/radeon/kms: add a new gem_wait ioctl with read/write flags\"\n vmwgfx: Don\u0027t pass unused arguments to do_dirty functions\n vmwgfx: Emulate depth 32 framebuffers\n drm/radeon: Lower the severity of the radeon lockup messages.\n drm/i915/dp: Fix eDP on PCH DP on CPT/PPT\n drm/i915/dp: Introduce is_cpu_edp()\n drm/i915: use correct SPD type value\n drm/i915: fix ILK+ infoframe support\n drm/i915: add DP test request handling\n drm/i915: read full receiver capability field during DP hot plug\n drm/i915/dp: Remove eDP special cases from bandwidth checks\n drm/i915/dp: Fix the math in intel_dp_link_required\n drm/i915/panel: Always record the backlight level again (but cleverly)\n i915: Move i915_read/write out of line\n drm/i915: remove transcoder PLL mashing from mode_set per specs\n drm/i915: if transcoder disable fails, say which\n drm/i915: set watermarks for third pipe on IVB\n drm/i915: export a CPT mode set verification function\n drm/i915: fix transcoder PLL select masking\n ...\n" }, { "commit": "8e6d539e0fd0c2124a20a207da70f2af7a9ae52c", "tree": "73016c1bdb5005125cdb5d60d48f73ab4300be64", "parents": [ "8237eb946a1a23c600fb289cf8dd3b399b10604e", "49d859d78c5aeb998b6936fcb5f288f78d713489" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:29:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:29:07 2011 -0700" }, "message": "Merge branch \u0027x86-rdrand-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-rdrand-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, random: Verify RDRAND functionality and allow it to be disabled\n x86, random: Architectural inlines to get random integers with RDRAND\n random: Add support for architectural random hooks\n\nFix up trivial conflicts in drivers/char/random.c: the architectural\nrandom hooks touched \"get_random_int()\" that was simplified to use MD5\nand not do the keyptr thing any more (see commit 6e5714eaf77d: \"net:\nCompute protocol sequence numbers and fragment IDs using MD5\").\n" }, { "commit": "7115e3fcf45514db7525a05365b10454ff7f345e", "tree": "17450e6337d559cc35dae6a7a73abab01ac63f00", "parents": [ "1f6e05171bb5cc32a4d6437ab2269fc21d169ca7", "c752d04066a36ae30b29795f3fa3f536292c1f8c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 17:03:38 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 17:03:38 2011 +0200" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)\n perf symbols: Increase symbol KSYM_NAME_LEN size\n perf hists browser: Refuse \u0027a\u0027 hotkey on non symbolic views\n perf ui browser: Use libslang to read keys\n perf tools: Fix tracing info recording\n perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads\n perf hists: Don\u0027t consider filtered entries when calculating column widths\n perf hists: Don\u0027t decay total_period for filtered entries\n perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}\n perf hists browser: Do not exit on tab key with single event\n perf annotate browser: Don\u0027t change selection line when returning from callq\n perf tools: handle endianness of feature bitmap\n perf tools: Add prelink suggestion to dso update message\n perf script: Fix unknown feature comment\n perf hists browser: Apply the dso and thread filters when merging new batches\n perf hists: Move the dso and thread filters from hist_browser\n perf ui browser: Honour the xterm colors\n perf top tui: Give color hints just on the percentage, like on --stdio\n perf ui browser: Make the colors configurable and change the defaults\n perf tui: Remove unneeded call to newtCls on startup\n perf hists: Don\u0027t format the percentage on hist_entry__snprintf\n ...\n\nFix up conflicts in arch/x86/kernel/kprobes.c manually.\n\nIngo\u0027s tree did the insane \"add volatile to const array\", which just\ndoesn\u0027t make sense (\"volatile const\"?). But we could remove the const\n*and* make the array volatile to make doubly sure that gcc doesn\u0027t\noptimize it away..\n\nAlso fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the\nreader_lock has been turned into a raw lock by the core locking merge,\nand there was a new user of it introduced in this perf core merge. Make\nsure that new use also uses the raw accessor functions.\n" }, { "commit": "982653009b883ef1529089e3e6f1ae2fee41cbe2", "tree": "eec3b1fe947d442ee204a2d648133bc5223e5c59", "parents": [ "37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec", "c020570138f5d9cb1fc0a853f9cf9e641178b5c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 16:11:53 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 16:11:53 2011 +0200" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, ioapic: Consolidate the explicit EOI code\n x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()\n x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC\n iommu: Rename the DMAR and INTR_REMAP config options\n x86, ioapic: Define irq_remap_modify_chip_defaults()\n x86, msi, intr-remap: Use the ioapic set affinity routine\n iommu: Cleanup ifdefs in detect_intel_iommu()\n iommu: No need to set dmar_disabled in check_zero_address()\n iommu: Move IOMMU specific code to intel-iommu.c\n intr_remap: Call dmar_dev_scope_init() explicitly\n x86, x2apic: Enable the bios request for x2apic optout\n" }, { "commit": "aa77677e0a288e08073620db5d2a31df83ca4788", "tree": "0d14b995a21c43f365d66b9ad101a334109fc4e4", "parents": [ "efb8d21b2c6db3497655cc6a033ae8a9883e4063", "43a3beb6da994549ec28a9f31727b997a025f958" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 15:39:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 15:39:02 2011 +0200" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)\n staging: et131x: Remove redundant check and return statement\n staging: et131x: Mainly whitespace changes to appease checkpatch\n staging: et131x: Remove last of the forward declarations\n staging: et131x: Remove even more forward declarations\n staging: et131x: Remove yet more forward declarations\n staging: et131x: Remove more forward declarations\n staging: et131x: Remove forward declaration of et131x_adapter_setup\n staging: et131x: Remove some forward declarations\n staging: et131x: Remove unused rx_ring.recv_packet_pool\n staging: et131x: Remove call to find pci pm capability\n staging: et131x: Remove redundant et131x_reset_recv() call\n staging: et131x: Remove unused rx_ring.recv_buffer_pool\n Staging: bcm: Fix three initialization errors in InterfaceDld.c\n Staging: bcm: Fix coding style issues in InterfaceDld.c\n staging:iio:dac: Add AD5360 driver\n staging:iio:trigger:bfin-timer: Fix compile error\n Staging: vt6655: add some range checks before memcpy()\n Staging: vt6655: whitespace fixes to iotcl.c\n Staging: vt6656: add some range checks before memcpy()\n Staging: vt6656: whitespace cleanups in ioctl.c\n ...\n\nFix up conflicts in:\n - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:\n\tvg driver movement\n - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:\n\tdriver removal vs now stale changes\n - drivers/staging/rtl8192e/r8192E_core.c:\n\tdriver removal vs now stale changes\n - drivers/staging/et131x/et131*:\n\tdriver consolidation into one file, tried to do fixups\n" }, { "commit": "59e52534172d845ebffb0d7e85fc56fb7b857051", "tree": "49552e03f1bdb413cd8b5f7542e91770688d7047", "parents": [ "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "0d89e54c8249645404283436d952afc261a04e1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)\n MAINTAINERS: linux-m32r is moderated for non-subscribers\n linux@lists.openrisc.net is moderated for non-subscribers\n Drop default from \"DM365 codec select\" choice\n parisc: Kconfig: cleanup Kernel page size default\n Kconfig: remove redundant CONFIG_ prefix on two symbols\n cris: remove arch/cris/arch-v32/lib/nand_init.S\n microblaze: add missing CONFIG_ prefixes\n h8300: drop puzzling Kconfig dependencies\n MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers\n tty: drop superfluous dependency in Kconfig\n ARM: mxc: fix Kconfig typo \u0027i.MX51\u0027\n Fix file references in Kconfig files\n aic7xxx: fix Kconfig references to READMEs\n Fix file references in drivers/ide/\n thinkpad_acpi: Fix printk typo \u0027bluestooth\u0027\n bcmring: drop commented out line in Kconfig\n btmrvl_sdio: fix typo \u0027btmrvl_sdio_sd6888\u0027\n doc: raw1394: Trivial typo fix\n CIFS: Don\u0027t free volume_info-\u003eUNC until we are entirely done with it.\n treewide: Correct spelling of successfully in comments\n ...\n" }, { "commit": "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "tree": "7a7b6cb22d1edaec10c3ae9d961b6e04c37d380c", "parents": [ "31dced41c6822ce751c033a53502ea4d8d399422", "1d927c3b5a4005a2ebc5356e7e1eec436e15fa22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:03:58 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:03:58 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:\n apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()\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": "43a3beb6da994549ec28a9f31727b997a025f958", "tree": "9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96", "68cf162a1af23c35db8e3b78659c99196c9882ff" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Oct 25 09:18:11 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Oct 25 09:18:11 2011 +0200" }, "message": "Merge branch \u0027staging-next\u0027 into Linux 3.1\n\nThis was done to resolve a conflict in the\ndrivers/staging/comedi/drivers/ni_labpc.c file that resolved a build\nbugfix in Linus\u0027s tree with a \"better\" bugfix that was in the\nstaging-next tree that resolved the issue in a more complete manner.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "9b553f72869584cc14d5724fbbc09f88de0f08de", "tree": "923d790483d32dd209bf1bf2cdfc7c7abbb68aa7", "parents": [ "c5c42360bc1cb14c7da3186683e9525b33b72656", "82d165557ef094d4b4dfc05871aee618ec7102b0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 24 05:48:39 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 24 05:48:39 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux into drm-core-next\n\n* \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux: (72 commits)\n drm/i915/dp: Fix eDP on PCH DP on CPT/PPT\n drm/i915/dp: Introduce is_cpu_edp()\n drm/i915: use correct SPD type value\n drm/i915: fix ILK+ infoframe support\n drm/i915: add DP test request handling\n drm/i915: read full receiver capability field during DP hot plug\n drm/i915/dp: Remove eDP special cases from bandwidth checks\n drm/i915/dp: Fix the math in intel_dp_link_required\n drm/i915/panel: Always record the backlight level again (but cleverly)\n i915: Move i915_read/write out of line\n drm/i915: remove transcoder PLL mashing from mode_set per specs\n drm/i915: if transcoder disable fails, say which\n drm/i915: set watermarks for third pipe on IVB\n drm/i915: export a CPT mode set verification function\n drm/i915: fix transcoder PLL select masking\n drm/i915: fix IVB cursor support\n drm/i915: fix debug output for 3 pipe configs\n drm/i915: add PLL sharing support to handle 3 pipes\n drm/i915: fix PCH PLL assertion check for 3 pipes\n drm/i915: use transcoder select bits on VGA and HDMI on CPT\n ...\n" }, { "commit": "5c0422878fcdc279ae9a8e8b66972a15b5efb67f", "tree": "13ed982427828e6a031dd5fd642f25b15c300d63", "parents": [ "f372b85463dac2fc696443d4c5063db2af5dcead" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Mon Oct 17 15:51:55 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Oct 20 15:26:39 2011 -0700" }, "message": "drm/i915: ILK + VT-d workaround\n\nIdle the GPU before doing any unmaps. We know if VT-d is in use through\nan exported variable from iommu code.\n\nThis should avoid a known HW issue.\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0", "tree": "b2619a068e98c755f6cefa1b22ac4880eaa7e23d", "parents": [ "237a62a1436eca94497476a9138baf795c16c97c" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Thu Oct 06 19:56:30 2011 +0200" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Oct 10 12:42:49 2011 +0200" }, "message": "hw_random: add driver for atmel true hardware random number generator\n\nFor the IP block on 9g45/9g46/9m10/9m11.\n\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nReviewed-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "9c48f1c629ecfa114850c03f875c6691003214de", "tree": "5e454da487c90fc8399ce366aa2437597c9ff5e5", "parents": [ "c9126b2ee8adb9235941cedbf558d39a9e65642d" ], "author": { "name": "Don Zickus", "email": "dzickus@redhat.com", "time": "Fri Sep 30 15:06:21 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Oct 10 06:56:57 2011 +0200" }, "message": "x86, nmi: Wire up NMI handlers to new routines\n\nJust convert all the files that have an nmi handler to the new routines.\nMost of it is straight forward conversion. A couple of places needed some\ntweaking like kgdb which separates the debug notifier from the nmi handler\nand mce removes a call to notify_die.\n\n[Thanks to Ying for finding out the history behind that mce call\n\nhttps://lkml.org/lkml/2010/5/27/114\n\nAnd Boris responding that he would like to remove that call because of it\n\nhttps://lkml.org/lkml/2011/9/21/163]\n\nThe things that get converted are the registeration/unregistration routines\nand the nmi handler itself has its args changed along with code removal\nto check which list it is on (most are on one NMI list except for kgdb\nwhich has both an NMI routine and an NMI Unknown routine).\n\nSigned-off-by: Don Zickus \u003cdzickus@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Huang Ying \u003cying.huang@intel.com\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nLink: http://lkml.kernel.org/r/1317409584-23662-4-git-send-email-dzickus@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "395cf9691d72173d8cdaa613c5f0255f993af94b", "tree": "813be524794fe1c0850805d7faca90e45fd0e60b", "parents": [ "e060c38434b2caa78efe7cedaff4191040b65a15" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Aug 15 02:02:26 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Sep 27 18:08:04 2011 +0200" }, "message": "doc: fix broken references\n\nThere are numerous broken references to Documentation files (in other\nDocumentation files, in comments, etc.). These broken references are\ncaused by typo\u0027s in the references, and by renames or removals of the\nDocumentation files. Some broken references are simply odd.\n\nFix these broken references, sometimes by dropping the irrelevant text\nthey were part of.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\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": "d3f138106b4b40640dc667f0222fd9f137387b32", "tree": "2c5d51deff32ec0999493bbb73cb18a7e4a455c3", "parents": [ "c39d77ffa28c6e72702193df4fa53928c1b6f3e6" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Tue Aug 23 17:05:25 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Sep 21 10:22:03 2011 +0200" }, "message": "iommu: Rename the DMAR and INTR_REMAP config options\n\nChange the CONFIG_DMAR to CONFIG_INTEL_IOMMU to be consistent\nwith the other IOMMU options.\n\nRename the CONFIG_INTR_REMAP to CONFIG_IRQ_REMAP to match the\nirq subsystem name.\n\nAnd define the CONFIG_DMAR_TABLE for the common ACPI DMAR\nroutines shared by both CONFIG_INTEL_IOMMU and CONFIG_IRQ_REMAP.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: yinghai@kernel.org\nCc: youquan.song@intel.com\nCc: joerg.roedel@amd.com\nCc: tony.luck@intel.com\nCc: dwmw2@infradead.org\nLink: http://lkml.kernel.org/r/20110824001456.558630224@sbsiddha-desk.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e060c38434b2caa78efe7cedaff4191040b65a15", "tree": "407361230bf6733f63d8e788e4b5e6566ee04818", "parents": [ "10e4ac572eeffe5317019bd7330b6058a400dfc2", "cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:05 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:18 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nFast-forward merge with Linus to be able to merge patches\nbased on more recent version of the tree.\n" }, { "commit": "a28ee477e5e5e183fa0289841fd90f350a6e0415", "tree": "080031d352e9bfeae9a0c0c03495dde007935182", "parents": [ "5369fcc127622660b1d259fa732420e4a2aecf07" ], "author": { "name": "Christian Dietrich", "email": "christian.dietrich@informatik.uni-erlangen.de", "time": "Sat Jun 04 17:36:33 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 14:05:25 2011 +0200" }, "message": "drivers/char/rtc: use printk_ratelimited instead of printk_ratelimit\n\nSince printk_ratelimit() shouldn\u0027t be used anymore (see comment in\ninclude/linux/printk.h), replace it with printk_ratelimited.\n\nSigned-off-by: Christian Dietrich \u003cchristian.dietrich@informatik.uni-erlangen.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "8e03bd6525d3281068519d5f6059cdcc5a67af66", "tree": "12e4cecbdef7eb38c8ff4406774008509a70fc47", "parents": [ "57f3224c3f838844cdae5e4a9d63e03152013f9a" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sat May 28 10:36:25 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 13:55:03 2011 +0200" }, "message": "char: Convert vmalloc/memset to vzalloc\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6eafa4604cfa109a89524d35d93df11c37bd66b0", "tree": "de0eddca052ed01318df559d7cd80211dd57a0fd", "parents": [ "c6a389f123b9f68d605bb7e0f9b32ec1e3e14132", "b9c4decbd9530b0c4c6dc4ad0626af628b79cd53" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 29 08:47:46 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 29 08:47:46 2011 -0700" }, "message": "Merge 3.1-rc4 into staging-next\n\nThis resolves a conflict with:\n\tdrivers/staging/brcm80211/brcmsmac/types.h\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7e8aa048989bf7e0604996a3e2068fb1a81f81bd", "tree": "58defa5a56ffa54b2a95fc857be487d318bf4dd3", "parents": [ "30ecad51849ae132dc6ef6ddb62d499c7257515b" ], "author": { "name": "Thomas Meyer", "email": "thomas@m3y3r.de", "time": "Thu Aug 25 15:59:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 25 16:25:33 2011 -0700" }, "message": "drivers/char/msm_smd_pkt.c: don\u0027t use IS_ERR()\n\nThe various basic memory allocation function return NULL, not an\nERR_PTR.\n\nThe semantic patch that makes this change is available in\nscripts/coccinelle/null/eno.cocci.\n\nMore information about semantic patching is available at\nhttp://coccinelle.lip6.fr/\n\nSigned-off-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: Niranjana Vishwanathapura \u003cnvishwan@codeaurora.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1ec3ba93c5fad9dca0dab272491c625fe6a2f67d", "tree": "8f75977579dbb96c73c52d2373a91afa66aeecec", "parents": [ "b64aa655c2a74716c00f7ee60d86a3d715ba1ca6" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Aug 24 14:44:13 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Aug 24 14:44:13 2011 -0700" }, "message": "Staging: remove drivers/char/scc.h as it should have gone a while ago\n\nThis was needed by one of the generic serial drivers that was removed a\nwhile ago. No one even noticed that the driver could not be built\nproperly while it was in the staging directory.\n\nSo this removed the unneeded .h file.\n\nReported-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\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": "fc000154d7a63dee209aab1c13f2c19abdcf6b59", "tree": "1f76e42f6289fadb195e898eefec96d98017f329", "parents": [ "d5d4e02874537d65ed2f431d39bf2f6d2967bd1b" ], "author": { "name": "Émeric Maschino", "email": "emeric.maschino@gmail.com", "time": "Tue Aug 23 21:48:23 2011 +0200" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Aug 23 13:31:59 2011 -0700" }, "message": "[IA64] agp/hp-agp: Allow binding user memory to the AGP GART\n\ndmesg reports:\n[   29.365973] [TTM] AGP Bind memory failed.\n[   29.366015] radeon 0000:80:00.0: object_init failed for (4096, 0x00000002)\n[   29.366052] radeon 0000:80:00.0: (-22) create WB bo failed\n[   29.366087] radeon 0000:80:00.0: Disabling GPU acceleration\n[   29.366124] [drm] radeon: cp finalized\n[   29.366168] [drm] radeon: cp finalized\n[   29.366210] [TTM] Finalizing pool allocator.\n[   29.366924] [TTM] Zone  kernel: Used memory at exit: 0 kiB.\n[   29.366961] [TTM] Zone   dma32: Used memory at exit: 0 kiB.\n[   29.366996] [drm] radeon: ttm finalized\n[   29.367030] [drm] Forcing AGP to PCI mode\n\nThis patch allows binding user memory to the AGP GART on zx1-based\nsystems. dmesg thus no more complains about AGP bind memory failure,\ndisabled GPU acceleration or AGP mode forced to PCI.\n\nOriginal work from Francisco Jerez in agp/amd-k7\n(https://lkml.org/lkml/2010/10/15/469).\n\nTested-by: Émeric Maschino \u003cemeric.maschino@gmail.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "1d927c3b5a4005a2ebc5356e7e1eec436e15fa22", "tree": "86a97fc15d4ea1d4fcd5bf5d92c31bb130ba6d75", "parents": [ "51414d41084496aaefd06d7f19eb8206e8bfac2d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Aug 18 10:06:53 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Aug 23 09:16:29 2011 +0200" }, "message": "apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()\n\nvfork is moving away from freezer_[do_not_]count() one way or the\nother leaving apm_ioctl() as the only user. apm_ioctl() just wants to\nwait for suspend/resume cycle to complete without hindering the\nfreezer. Use wait_event_freezable() instead.\n\nThe only annoyance is that wait_event_freezable() wakes up with\n-ERESTART if there are pending signals while apm_ioctl() wants to\nignore all signals until suspend is complete. We can play with\n@current-\u003e[real_]blocked but this is hardly a performance or latency\ncritical path - simply chill a bit on each iteration until\nSUSPEND_DONE for unlikely cases where there are pending signals.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6e5714eaf77d79ae1c8b47e3e040ff5411b717ec", "tree": "30bd0d7a6a0a6ff0ace6da1835ae7b7167cce5e4", "parents": [ "bc0b96b54a21246e377122d54569eef71cec535f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 03 20:50:44 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 06 18:33:19 2011 -0700" }, "message": "net: Compute protocol sequence numbers and fragment IDs using MD5.\n\nComputers have become a lot faster since we compromised on the\npartial MD4 hash which we use currently for performance reasons.\n\nMD5 is a much safer choice, and is inline with both RFC1948 and\nother ISS generators (OpenBSD, Solaris, etc.)\n\nFurthermore, only having 24-bits of the sequence number be truly\nunpredictable is a very serious limitation. So the periodic\nregeneration and 8-bit counter have been removed. We compute and\nuse a full 32-bit sequence number.\n\nFor ipv6, DCCP was found to use a 32-bit truncated initial sequence\nnumber (it needs 43-bits) and that is fixed here as well.\n\nReported-by: Dan Kaminsky \u003cdan@doxpara.com\u003e\nTested-by: Willy Tarreau \u003cw@1wt.eu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "f7b9fcbbc3b8593ff7dc587f90c2fe90a2fd1e6f", "tree": "8f025aefd6cd80d5b1062b43668553c2a2296c5a", "parents": [ "f2d34fd9435c7e60cb5189d036efe9abfc911862" ], "author": { "name": "Sergiu Iordache", "email": "sergiu@chromium.org", "time": "Wed Aug 03 16:21:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:21 2011 -1000" }, "message": "ramoops: update module parameters\n\nUpdate the module parameters when platform data is used. This means\nthat they can be read from /sys/module/ramoops/parameters in order to\nparse the memory area.\n\nSigned-off-by: Sergiu Iordache \u003csergiu@chromium.org\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Seiji Aguchi \u003cseiji.aguchi@hds.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1850536b93888e6cc3ee42e63e20e61f35f8b3e2", "tree": "7b78bf5196ca79f52f0fd7c932ea8062c91ff154", "parents": [ "ed8f37370d83e695c0a4fa5d5fc7a83ecb947526", "d1afa65ca59d4e6a5f1a8c1ab9bfa73f2fa8b777" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:16:11 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:16:11 2011 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile/mm/init.c: trivial: use BUG_ON\n arch/tile: remove useless set_fixmap_nocache() macro\n arch/tile: add hypervisor-based character driver for SPI flash ROM\n ioctl-number.txt: add the tile hardwall ioctl range\n tile: use generic-y format for one-line asm-generic headers\n clocksource: tile: convert to use clocksource_register_hz\n" }, { "commit": "3d071cd313643cf82b1ce1ce4fdf08d63ad53964", "tree": "874c1683f32f07614aa123f6ca5cf6c2bd443704", "parents": [ "cf8e98d15361f8c594da00a3f7a500787fc1a426", "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Aug 02 16:14:02 2011 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Aug 02 16:14:02 2011 -0400" }, "message": "Merge tag \u0027v3.0\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus\n" }, { "commit": "63d77173266c1791f1553e9e8ccea65dc87c4485", "tree": "81c69a2f30a9bd8302d690000215b474886d0152", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sun Jul 31 13:54:50 2011 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sun Jul 31 13:54:50 2011 -0700" }, "message": "random: Add support for architectural random hooks\n\nAdd support for architecture-specific hooks into the kernel-directed\nrandom number generator interfaces. This patchset does not use the\narchitecture random number generator interfaces for the\nuserspace-directed interfaces (/dev/random and /dev/urandom), thus\neliminating the need to distinguish between them based on a pool\npointer.\n\nChanges in version 3:\n- Moved the hooks from extract_entropy() to get_random_bytes().\n- Changes the hooks to inlines.\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "83c1b31794a9e3cb30edabef7e57fbdbe129c5ce", "tree": "a23269345efe190925eb4bc045f19fcb5fc42178", "parents": [ "f85f19de90a9997583bb26e6f1f9297a4e152c18" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Fri Jul 29 17:11:32 2011 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 29 23:41:09 2011 -0700" }, "message": "ramoops: fix compile failure on parisc\n\nFixes this:\n\n drivers/char/ramoops.c: In function \u0027ramoops_init\u0027:\n drivers/char/ramoops.c:221: error: implicit declaration of function \u0027IS_ERR\u0027\n drivers/char/ramoops.c:222: error: implicit declaration of function \u0027PTR_ERR\u0027\n\nIf it actually builds on other platforms, it\u0027s probably getting\nlinux/err.h via some other #include.\n\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "24f146696184cbe4b440179064a45dfddaad4cc4", "tree": "b47f8a2a97d620e0542f90fd2dd620a87f4154ca", "parents": [ "4ba991d3eb379fbaa22049e7002341e97a673685" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 27 23:33:03 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 28 01:26:30 2011 -0700" }, "message": "n2rng: Attach on Niagara-T3.\n\nAnd stop referring to Victoria Falls, as the attribute we\u0027re\ntalking about is whether the rng is multi-unit capable which\napplies to several chip variants now.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95b6886526bb510b8370b625a49bc0ab3b8ff10f", "tree": "2862606224820d200be12d2092dcd26df1654b80", "parents": [ "22712200e175e0df5c7f9edfe6c6bf5c94c23b83", "29412f0f6a19e34336368f13eab848091c343952" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 27 19:26:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 27 19:26:38 2011 -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: (54 commits)\n tpm_nsc: Fix bug when loading multiple TPM drivers\n tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block\n tpm: Fix compilation warning when CONFIG_PNP is not defined\n TOMOYO: Update kernel-doc.\n tpm: Fix a typo\n tpm_tis: Probing function for Intel iTPM bug\n tpm_tis: Fix the probing for interrupts\n tpm_tis: Delay ACPI S3 suspend while the TPM is busy\n tpm_tis: Re-enable interrupts upon (S3) resume\n tpm: Fix display of data in pubek sysfs entry\n tpm_tis: Add timeouts sysfs entry\n tpm: Adjust interface timeouts if they are too small\n tpm: Use interface timeouts returned from the TPM\n tpm_tis: Introduce durations sysfs entry\n tpm: Adjust the durations if they are too small\n tpm: Use durations returned from TPM\n TOMOYO: Enable conditional ACL.\n TOMOYO: Allow using argv[]/envp[] of execve() as conditions.\n TOMOYO: Allow using executable\u0027s realpath and symlink\u0027s target as conditions.\n TOMOYO: Allow using owner/group etc. of file objects as conditions.\n ...\n\nFix up trivial conflict in security/tomoyo/realpath.c\n" } ], "next": "60063497a95e716c9a689af3be2687d261f115b4" }