)]}' { "log": [ { "commit": "98e96852480566333f6dacd3223f0be15df34d60", "tree": "dab2122717f7e371d9e20c0bc3561c501d61c658", "parents": [ "8eef05dd3e70233f3e391774d612dab44c3f023b", "9f1065032ceb7e86c7c9f16bb86518857e88a172" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 15:54:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 15:54:02 2012 -0800" }, "message": "Merge tag \u0027fbdev-fixes-for-3.3-1\u0027 of git://github.com/schandinat/linux-2.6\n\nfbdev fixes for 3.3\n\nIt includes:\n - compile fix for fsl-diu-fb\n - fix for a suspend/resume issue in atmel_lcdfb\n - fix for a suspend/resume issue in OMAP\n - workaround for a hardware bug to avoid physical damage in OMAP\n - really trivial dead code removal in intelfb\n\n* tag \u0027fbdev-fixes-for-3.3-1\u0027 of git://github.com/schandinat/linux-2.6:\n atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume\n intelfb: remove some dead code\n drivers/video: compile fixes for fsl-diu-fb.c\n OMAPDSS: HDMI: PHY burnout fix\n OMAP: 4430SDP/Panda: add HDMI HPD gpio\n OMAP: 4430SDP/Panda: setup HDMI GPIO muxes\n OMAPDSS: remove wrong HDMI HPD muxing\n OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD\n OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios\n OMAPDSS: use sync versions of pm_runtime_put\n" }, { "commit": "8eef05dd3e70233f3e391774d612dab44c3f023b", "tree": "dda65b15abaa42564d2e46424bfe6a7a73cc5681", "parents": [ "6bd113f1f4a8c0d05c4dbadb300319e0e3526db4" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Feb 03 15:20:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 15:53:08 2012 -0800" }, "message": "checkpatch: Warn on code with 6+ tab indentation\n\nOverly indented code should be refactored.\n\nSuggest refactoring excessive indentation of of\nif/else/for/do/while/switch statements.\n\nFor example:\n\n$ cat t.c\n#include \u003cstdio.h\u003e\n#include \u003cstdlib.h\u003e\n\nint main(int argc, char **argv)\n{\n\n\tif (1)\n\t\tif (2)\n\t\t\tif (3)\n\t\t\t\tif (4)\n\t\t\t\t\tif (5)\n\t\t\t\t\t\tif (6)\n\t\t\t\t\t\t\tif (7)\n\t\t\t\t\t\t\t\tif (8)\n\t\t\t\t\t\t\t\t\t;\n\treturn 0;\n}\n\n$ ./scripts/checkpatch.pl -f t.c\nWARNING: Too many leading tabs - consider code refactoring\n#12: FILE: t.c:12:\n+\t\t\t\t\t\tif (6)\n\nWARNING: Too many leading tabs - consider code refactoring\n#13: FILE: t.c:13:\n+\t\t\t\t\t\t\tif (7)\n\nWARNING: Too many leading tabs - consider code refactoring\n#14: FILE: t.c:14:\n+\t\t\t\t\t\t\t\tif (8)\n\ntotal: 0 errors, 3 warnings, 17 lines checked\n\nt.c has style problems, please review.\n\nIf any of these errors are false positives, please report\nthem to the maintainer, see CHECKPATCH in MAINTAINERS.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6bd113f1f4a8c0d05c4dbadb300319e0e3526db4", "tree": "f357b1130950d8de320885810eb27fe574f6ebf5", "parents": [ "95025d6b27721ae8bbce592403fdc06e982204c8", "715252d41912941efb791a7b7bad94d2614dc5c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:35:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:35:19 2012 -0800" }, "message": "Merge tag \u0027ib-srpt-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nCleanups and error path fixes for the new SRP (SCSI RDMA protocol) target.\n\n* tag \u0027ib-srpt-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/srpt: Don\u0027t return freed pointer from srpt_alloc_ioctx_ring()\n IB/srpt: Fix ERR_PTR() vs. NULL checking confusion\n IB/srpt: Remove unneeded \u003clinux/version.h\u003e include\n IB/srpt: Use ARRAY_SIZE() instead of open-coding\n IB/srpt: Use DEFINE_SPINLOCK()/LIST_HEAD()\n" }, { "commit": "95025d6b27721ae8bbce592403fdc06e982204c8", "tree": "04cdc095c1d1b41406ebaf6c5d3639f4d27b3f38", "parents": [ "59c1204d464075fcb5d02e7daa6b23782dd4a088", "1e05b62ae4bd4c1209229de367b0989b39644f88" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:32:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:32:24 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n\narch: fix ioport mapping on mips,sh\n\nKevin Cernekee reported that recent cleanup that replaced pci_iomap with\na generic function failed to take into account the differences in io\nport handling on mips and sh architectures.\n\nRather than revert the changes reintroducing the code duplication, this\npatchset fixes this by adding ability for architectures to override\nioport mapping for pci devices.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:\n sh: use the the PCI channels\u0027s io_map_base\n mips: use the the PCI controller\u0027s io_map_base\n lib: add NO_GENERIC_PCI_IOPORT_MAP\n" }, { "commit": "59c1204d464075fcb5d02e7daa6b23782dd4a088", "tree": "8d35307db2b021ccfe56ab7986daf81927f2dc18", "parents": [ "84f8bf38b9368add916e7c335b6b94a7ae927cb1" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue Feb 07 08:20:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:31:35 2012 -0800" }, "message": "ACPI: remove duplicated lines of merging problems with acpi_processor_add\n\nThose lines have two copies.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Thomas Renninger \u003ctrenn@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "84f8bf38b9368add916e7c335b6b94a7ae927cb1", "tree": "e6360985eb4866d22104c63045fc2cf789e449de", "parents": [ "e25c173379d1053f0851fa924cd608fc0b16252f", "de47a4176c532ef5961b8a46a2d541a3517412d3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:07:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:07:20 2012 -0800" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\n* git://git.samba.org/sfrench/cifs-2.6:\n cifs: Fix oops in session setup code for null user mounts\n [CIFS] Update cifs Kconfig title to match removal of experimental dependency\n cifs: fix printk format warnings\n cifs: check offset in decode_ntlmssp_challenge()\n cifs: NULL dereference on allocation failure\n" }, { "commit": "e25c173379d1053f0851fa924cd608fc0b16252f", "tree": "5819d87168530aacef34d3d2fadc45069de901fa", "parents": [ "abaaf3e12c74ef39c8ba185c485f63274264cb0f", "217c8b2b1978aa4a02ce040a99c59ed3b6418fe5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:06:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:06:11 2012 -0800" }, "message": "Merge branch \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: wiimote: fix invalid power_supply_powers call\n HID: wacom: Fix invalid power_supply_powers calls\n HID: hyperv: Properly disconnect the input device\n HID: usbhid: fix dead lock between open and disconect\n" }, { "commit": "abaaf3e12c74ef39c8ba185c485f63274264cb0f", "tree": "72851a2095cadb38473c1460a31942403daa2e4b", "parents": [ "71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63", "2bd05db718cf452fe235c7c08083b2e60f787f3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:05:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:05:49 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Avoid twl6040-codec PLL reconfiguration when not needed\n mfd: Store twl6040-codec mclk configuration\n" }, { "commit": "217c8b2b1978aa4a02ce040a99c59ed3b6418fe5", "tree": "8577b6f95ee1fd924e19831528a8a1f929d7066a", "parents": [ "d7cb3dbd10c09081fafd05fcbef590ce04e402ff" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 07 13:40:56 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 07 13:40:56 2012 +0100" }, "message": "HID: wiimote: fix invalid power_supply_powers call\n\nAnalogically to d7cb3dbd1 (\"HID: wacom: Fix invalid power_supply_powers\ncalls\"), fix also the same occurence in wiimote driver.\n\nReported-by: przemo@firszt.eu\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63", "tree": "b02e34fc8b8636d2f934998270dbfb3f7e959af2", "parents": [ "f5fe184b08daf0c34b0de0d02c7033fe119dbf0a" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Mon Feb 06 09:50:00 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 16:29:19 2012 -0800" }, "message": "Documentation: update quilt tree location for Documentation patches\n\nUpdate quilt tree location for Documentation/ patches.\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f5fe184b08daf0c34b0de0d02c7033fe119dbf0a", "tree": "91cd76407a4013ca3a2828191d75659fc4ab0506", "parents": [ "14fdbf7eb4fb3fc4ab01f88470549783c4c8d3d5" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Feb 06 09:49:50 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 16:29:19 2012 -0800" }, "message": "Documentation: add missing tainted bits to Documentation/sysctl/kernel.txt\n\nTwo of the bits in the tainted flag are not documented.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "14fdbf7eb4fb3fc4ab01f88470549783c4c8d3d5", "tree": "a585e747011bab0f413591b0bcf75b1c60f66983", "parents": [ "8597559a78e1cde158b999212bc9543682638eb1", "5753785fa97742d2723ed8ebb29ae59cac912705" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 16:26:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 16:26:58 2012 -0800" }, "message": "Merge branch \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nFixing a regression with the PMU MSRs when PMU virtualization is\ndisabled, a guest-internal DoS with the SYSCALL instruction, and a dirty\nmemory logging race that may cause live migration to fail.\n\n* \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: do not #GP on perf MSR writes when vPMU is disabled\n KVM: x86: fix missing checks in syscall emulation\n KVM: x86: extend \"struct x86_emulate_ops\" with \"get_cpuid\"\n KVM: Fix __set_bit() race in mark_page_dirty() during dirty logging\n" }, { "commit": "8597559a78e1cde158b999212bc9543682638eb1", "tree": "4e62beca0e5eeb5d224e880bf4c0e676b73b781f", "parents": [ "105e5180936d69b1aee46ead8a5fc6c68f4d5f65", "7e3a70fb7bccada029c188c89bfbf3c0a63c1500" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 15:29:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 15:29:56 2012 -0800" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nGPIO fixes for v3.3-rc2\n\nStraight forward bug fixes in this branch. A couple of x86 gpio drivers\nmissing spinlock initialization, an API change fixup for the samsung driver\nand a name typo fix.\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio: Add missing spin_lock_init in gpio-ml-ioh driver\n gpio: Add missing spin_lock_init in gpio-pch driver\n gpio: samsung: adapt to changes in gpio specifier translator function declaration\n Correct bad gpio naming\n" }, { "commit": "105e5180936d69b1aee46ead8a5fc6c68f4d5f65", "tree": "22f18ca257da17233a757c63fb8e25bb76d6c11a", "parents": [ "96e02d1586782eadf051fa3d6bc4132d2447ac2c", "585c0fd8216e0c9f98e2434092af7ec0f999522d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 15:25:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 15:25:48 2012 -0800" }, "message": "Merge tag \u0027hwmon-fixes-for-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nOne patch to fix fan detection on NCT6776F.\n\n* tag \u0027hwmon-fixes-for-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (w83627ehf) Fix number of fans for NCT6776F\n" }, { "commit": "96e02d1586782eadf051fa3d6bc4132d2447ac2c", "tree": "dd40e6302d2770d3c51cced64cfd3b8cf1355da4", "parents": [ "23783f817bceedd6d4e549385e3f400ea64059e5" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Sat Feb 04 10:47:10 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 15:15:20 2012 -0800" }, "message": "exec: fix use-after-free bug in setup_new_exec()\n\nSetting the task name is done within setup_new_exec() by accessing\nbprm-\u003efilename. However this happens after flush_old_exec().\nThis may result in a use after free bug, flush_old_exec() may\n\"complete\" vfork_done, which will wake up the parent which in turn\nmay free the passed in filename.\nTo fix this add a new tcomm field in struct linux_binprm which\ncontains the now early generated task name until it is used.\n\nFixes this bug on s390:\n\n Unable to handle kernel pointer dereference at virtual kernel address 0000000039768000\n Process kworker/u:3 (pid: 245, task: 000000003a3dc840, ksp: 0000000039453818)\n Krnl PSW : 0704000180000000 0000000000282e94 (setup_new_exec+0xa0/0x374)\n Call Trace:\n ([\u003c0000000000282e2c\u003e] setup_new_exec+0x38/0x374)\n [\u003c00000000002dd12e\u003e] load_elf_binary+0x402/0x1bf4\n [\u003c0000000000280a42\u003e] search_binary_handler+0x38e/0x5bc\n [\u003c0000000000282b6c\u003e] do_execve_common+0x410/0x514\n [\u003c0000000000282cb6\u003e] do_execve+0x46/0x58\n [\u003c00000000005bce58\u003e] kernel_execve+0x28/0x70\n [\u003c000000000014ba2e\u003e] ____call_usermodehelper+0x102/0x140\n [\u003c00000000005bc8da\u003e] kernel_thread_starter+0x6/0xc\n [\u003c00000000005bc8d4\u003e] kernel_thread_starter+0x0/0xc\n Last Breaking-Event-Address:\n [\u003c00000000002830f0\u003e] setup_new_exec+0x2fc/0x374\n\n Kernel panic - not syncing: Fatal exception: panic_on_oops\n\nReported-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "715252d41912941efb791a7b7bad94d2614dc5c3", "tree": "d2fe70572bb550113f76e5984bc4eaf9e8e5694a", "parents": [ "3af336376f77859da84bb1156ef29d5337b316a9" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sat Feb 04 23:49:40 2012 +0100" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Feb 06 08:57:11 2012 -0800" }, "message": "IB/srpt: Don\u0027t return freed pointer from srpt_alloc_ioctx_ring()\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "d7cb3dbd10c09081fafd05fcbef590ce04e402ff", "tree": "025f3d9d9a0dfdd609a82719e7c6fcb517a225a5", "parents": [ "d4730ace0c7dbb64513e35b6fc5fd7e7f381e490" ], "author": { "name": "Przemo Firszt", "email": "przemo@firszt.eu", "time": "Sun Feb 05 22:35:24 2012 +0000" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Feb 06 16:14:20 2012 +0100" }, "message": "HID: wacom: Fix invalid power_supply_powers calls\n\npower_supply_powers calls added in 35b4c01e2 (\"power_supply: add \"powers\" links\nto self-powered HID devices\") have to be called after power device is created.\nThis patch also fixes the second call - it has to be \"ac\" instead of \"battery\"\n\nSigned-off-by: Przemo Firszt \u003cprzemo@firszt.eu\u003e\nSigned-off-by: Chris Bagwell \u003cchris@cnpbagwell.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d4730ace0c7dbb64513e35b6fc5fd7e7f381e490", "tree": "18890c096cdd869a593c56de3257faa40af8e050", "parents": [ "c1c454b8691cc95aa83f19273ed7845914c70e83", "23783f817bceedd6d4e549385e3f400ea64059e5" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Feb 06 16:11:09 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Feb 06 16:12:16 2012 +0100" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into upstream-fixes\n\nSync with Linus\u0027 tree. This is necessary to have a base for\npatch that fixes commit 35b4c01e29b (\"power_supply: add \"powers\"\nlinks to self-powered HID devices\") which went in through Anton\u0027s\ntree.\n" }, { "commit": "585c0fd8216e0c9f98e2434092af7ec0f999522d", "tree": "77da351a59212e1752aee600c0db0017bc3da79f", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Fri Jan 27 05:43:59 2012 -0800" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Feb 04 18:08:23 2012 -0800" }, "message": "hwmon: (w83627ehf) Fix number of fans for NCT6776F\n\nNCT6776F can select fan input pins for fans 3 to 5 with a secondary set of\nchip register bits. Check that second set of bits in addition to the first set\nto detect if fans 3..5 are monitored.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nCc: stable@vger.kernel.org # 3.0+\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "23783f817bceedd6d4e549385e3f400ea64059e5", "tree": "db770bd3d7b9264e0f5ed614d9c570d729caf8de", "parents": [ "d9142025f55973149a854c97e860fff61ed05b37", "d020283dc694c9ec31b410f522252f7a8397e67d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 15:21:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 15:21:39 2012 -0800" }, "message": "Merge tag \u0027pm-fixes-for-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPower management fixes for 3.3-rc3\n\nThree power management regression fixes, one for a recent regression introcuded\nby the freezer changes during the 3.3 merge window and two for regressions\nin cpuidle (resulting from PM QoS changes) and in the hibernate user space\ninterface, both introduced during the 3.2 development cycle.\n\nThey include:\n\n* Two hibernate (s2disk) regression fixes from Srivatsa S. Bhat (for\n regressions introduced during the 3.3 merge window and during the 3.2\n development cycle).\n\n* A cpuidle fix from Venki Pallipadi for a regression resulting from PM QoS\n changes during the 3.2 development cycle causing cpuidle to work incorrectly\n for CONFIG_PM unset.\n\n* tag \u0027pm-fixes-for-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / QoS: CPU C-state breakage with PM Qos change\n PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails\n PM / Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path\n" }, { "commit": "d020283dc694c9ec31b410f522252f7a8397e67d", "tree": "50ffaf8d59d5f7951f09f7b61eac584f64b7ad96", "parents": [ "379e0be812ab8a2a351e784b0c987788f5123090" ], "author": { "name": "Venkatesh Pallipadi", "email": "venki@google.com", "time": "Fri Feb 03 22:22:25 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Feb 04 22:23:17 2012 +0100" }, "message": "PM / QoS: CPU C-state breakage with PM Qos change\n\nLooks like change \"PM QoS: Move and rename the implementation files\"\nmerged during the 3.2 development cycle made PM QoS depend on\nCONFIG_PM which depends on (PM_SLEEP || PM_RUNTIME).\n\nThat breaks CPU C-states with kernels not having these CONFIGs, causing CPUs\nto spend time in Polling loop idle instead of going into deep C-states,\nconsuming way way more power. This is with either acpi idle or intel idle\nenabled.\n\nEither CONFIG_PM should be enabled with any pm_qos users or\nthe !CONFIG_PM pm_qos_request() should return sane defaults not to break\nthe existing users. Here\u0027s is the patch for the latter option.\n\n[rjw: Modified the changelog slightly.]\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "379e0be812ab8a2a351e784b0c987788f5123090", "tree": "70f1e7ac57e198d0a94a89a65933da9a2ca35ccc", "parents": [ "fe9161db2e6053da21e4649d77bbefaf3030b11d" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Fri Feb 03 22:22:41 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Feb 04 22:23:05 2012 +0100" }, "message": "PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails\n\nIf freezing of kernel threads fails, we are expected to automatically\nthaw tasks in the error recovery path. However, at times, we encounter\nsituations in which we would like the automatic error recovery path\nto thaw only the kernel threads, because we want to be able to do\nsome more cleanup before we thaw userspace. Something like:\n\nerror \u003d freeze_kernel_threads();\nif (error) {\n\t/* Do some cleanup */\n\n\t/* Only then thaw userspace tasks*/\n\tthaw_processes();\n}\n\nAn example of such a situation is where we freeze/thaw filesystems\nduring suspend/hibernation. There, if freezing of kernel threads\nfails, we would like to thaw the frozen filesystems before thawing\nthe userspace tasks.\n\nSo, modify freeze_kernel_threads() to thaw only kernel threads in\ncase of freezing failure. And change suspend_freeze_processes()\naccordingly. (At the same time, let us also get rid of the rather\ncryptic usage of the conditional operator (:?) in that function.)\n\n[rjw: In fact, this patch fixes a regression introduced during the\n 3.3 merge window, because without it thaw_processes() may be called\n before swsusp_free() in some situations and that may lead to massive\n memory allocation failures.]\n\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "d9142025f55973149a854c97e860fff61ed05b37", "tree": "01e1b887513792550b0bdd5b73708c657af876ab", "parents": [ "31c150a11c867da233a7b5e13b45bcbd3a796bde", "ca43784daa7a400407d851799ac69d3de2b2ab4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 12:11:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 12:11:40 2012 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\narm-soc fixes for 3.3-rc\n\n* A series of OMAP regression fixes for merge window fallout\n* Two patches for Davinci, one removes some misdefined clocks, the other\n is a regression fix for merge window fallout\n* Two patches that makes Broadcom bcmring build again (and removes a\n bunch of unused code in the process)\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: bcmring: fix build failure in mach-bcmring/arch.c\n ARM: bcmring: remove unused DMA map code\n ARM: davinci: update mdio bus name\n ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap\n ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree\n ARM: OMAP: fix MMC2 loopback clock handling\n ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup\n ARM: OMAP2+: GPMC: fix device size setup\n ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter\n ARM: OMAP3: hwmod data: register dss hwmods after dss_core\n ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage\n ARM: OMAP2+: io: fix compilation breakage on 2420-only configs\n ARM: OMAP4: hwmod data: Add names for DMIC memory address space\n ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc\n ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class\n ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks\n ARM: OMAP2: fix regulator warnings\n ARM: OMAP2: fix omap3 touchbook kconfig warning\n i2c: OMAP: Fix OMAP1 build error\n" }, { "commit": "ca43784daa7a400407d851799ac69d3de2b2ab4e", "tree": "81e4e084faf46a0f0d289cc264dd88ffcb296083", "parents": [ "864e5e360ebb5acc7a41c6d6ac738a62aa1aa609" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sat Feb 04 11:29:02 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Feb 04 11:38:20 2012 -0800" }, "message": "ARM: bcmring: fix build failure in mach-bcmring/arch.c\n\nUpstream commit d1fce9c115eeb93e01c01732dfe9a86cf76009cf\n\n \"ARM: restart: bcmring: use new restart hook\"\n\nbreaks building of this platform, since what used to be the\nlast field of the MACHINE_START/END block didn\u0027t have a\ntrailing comma. Once another field was added below, we get:\n\narch/arm/mach-bcmring/arch.c:198: error: request for member \u0027restart\u0027 in something not a structure or union\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "864e5e360ebb5acc7a41c6d6ac738a62aa1aa609", "tree": "8b08ed7fe72af76cc62b0f50e01dab01f694c238", "parents": [ "4a81220a61d0cb67880078298485b68da87d8a34" ], "author": { "name": "JD Zheng", "email": "jdzheng@broadcom.com", "time": "Mon Jan 30 10:59:01 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Feb 04 11:27:13 2012 -0800" }, "message": "ARM: bcmring: remove unused DMA map code\n\nRemove BCMRING DMA map code which is no longer used.\n\nThis also fixes a build error with dma.c introduced by\nbfcd2ea6a40b33270564d706396f1b514a988d3c.\n\nSigned-off-by: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "31c150a11c867da233a7b5e13b45bcbd3a796bde", "tree": "58202fc8e93833f3ea3e52f9cb0093e61265d73d", "parents": [ "4554c135a0a017f4cd96f7c0612cb7ca78c68d08", "82b982c9a697e7be0745523a53334fe38a4582c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:57:42 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:57:42 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: i8042 - add Lenovo Ideapad U455 to \u0027reset\u0027 blacklist\n Input: serio_raw - return proper result when serio_raw_read fails\n Input: document device properties\n Input: twl4030_keypad - fix comment (trivial)\n Input: gpio_keys - fix struct device declared inside parameter list\n Input: evdev - fix variable initialisation\n" }, { "commit": "4554c135a0a017f4cd96f7c0612cb7ca78c68d08", "tree": "7233d0c493223fb3769c4dd0668bd8da4fd02241", "parents": [ "82bdc843c2be0ce199e8e247dfb2a17248cbd6c4", "94ac27a54be6a14948f0a9b3f542b4ff1faac232" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:54:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:54:26 2012 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n i.MX SDMA: Fix burstsize settings\n ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only\n dma: sh_dma: not all SH DMAC implementations support MEMCPY\n at_hdmac: bugfix for enabling channel irq\n dmaengine: fix missing \u0027cnt\u0027 in ?: in dmatest\n" }, { "commit": "82bdc843c2be0ce199e8e247dfb2a17248cbd6c4", "tree": "f04e4c0935dd9e3f05741bf812229b36b18683cd", "parents": [ "71b1b20b8aea6ba4a1a15736409f1261d8dfe1da", "0bf380bc70ecba68cb4d74dc656cc2fa8c4d801a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:51:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:51:54 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027\n\n* akpm:\n mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration\n readahead: fix pipeline break caused by block plug\n kprobes: fix a memory leak in function pre_handler_kretprobe()\n drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer\n lkdtm: avoid calling lkdtm_do_action() with spinlock held\n mm/filemap_xip.c: fix race condition in xip_file_fault()\n mm/memcontrol.c: fix warning with CONFIG_NUMA\u003dn\n avr32: select generic atomic64_t support\n mm: postpone migrated page mapping reset\n xtensa: fix memscan()\n MAINTAINERS: update lguest F: patterns\n MAINTAINERS: remove staging sections\n MAINTAINERS: remove iMX5 section\n MAINTAINERS: update partitions block F: patterns\n" }, { "commit": "71b1b20b8aea6ba4a1a15736409f1261d8dfe1da", "tree": "494acfa3fee2b77ee6104fc623f760c7253d3ccb", "parents": [ "d12566674c2d8d1275e197c01b44b481de42eda9", "500823195d0c9eec2a4637484f30cc93ec633d4a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 07:17:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 07:17:47 2012 -0800" }, "message": "Merge tag \u0027for-linus-3.3\u0027 of git://git.infradead.org/~dwmw2/mtd-3.3\n\n - Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1\n - Fix breakage with MTD suspend caused by the API rework\n - Fix a problem with resetting the MX28 BCH module\n - A couple of other trivial fixes\n\n* tag \u0027for-linus-3.3-20120204\u0027 of git://git.infradead.org/~dwmw2/mtd-3.3:\n Revert \"mtd: atmel_nand: optimize read/write buffer functions\"\n mtd: fix MTD suspend\n jffs2: do not initialize variable unnecessarily\n mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23\n mtd: nand: fix typo in comment\n" }, { "commit": "500823195d0c9eec2a4637484f30cc93ec633d4a", "tree": "9fa140cfce10567d10f5e7e708f71193ff9ec228", "parents": [ "1a30871fe635d3e92972e6b93e39ff65bb57e52d" ], "author": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@linux.intel.com", "time": "Thu Feb 02 13:54:25 2012 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Feb 04 08:04:57 2012 +0000" }, "message": "Revert \"mtd: atmel_nand: optimize read/write buffer functions\"\n\nThis reverts commit fb5427508abbd635e877fabdf55795488119c2d6.\n\nThe reason is that it breaks 16 bits NAND flash as it was reported by\nNikolaus Voss and confirmed by Eric Bénard.\n\nNicolas Ferre \u003cnicolas.ferre@atmel.com\u003e alco confirmed:\n\"After double checking with designers, I must admit that I misunderstood\nthe way of optimizing accesses to SMC. 16 bit nand is not so common\nthose days...\"\n\nReported-by: Nikolaus Voss \u003cn.voss@weinmann.de\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nCc: stable@kernel.org [3.1+]\n" }, { "commit": "d12566674c2d8d1275e197c01b44b481de42eda9", "tree": "c1597da9080aa6ef26c646f4c781a0f7b68da603", "parents": [ "7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f", "5a97d0ae5b5d78727b87965cba84194a9f1e06ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:57:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:57:40 2012 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers\n ARM: 7302/1: Add TLB flushing for both entries in a PMD\n ARM: 7303/1: perf: add empty NODE event definitions for Cortex-A5 and Cortex-A15\n ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers\n ARM: 7307/1: vfp: fix ptrace regset modification race\n ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe\n Revert \"ARM: 7304/1: ioremap: fix boundary check when reusing static mapping\"\n" }, { "commit": "0bf380bc70ecba68cb4d74dc656cc2fa8c4d801a", "tree": "6d5869a979b62c3b21491f007519185af30442a0", "parents": [ "3deaa7190a8da38453c4fabd9dec7f66d17fff67" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Fri Feb 03 15:37:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:41 2012 -0800" }, "message": "mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration\n\nWhen isolating for migration, migration starts at the start of a zone\nwhich is not necessarily pageblock aligned. Further, it stops isolating\nwhen COMPACT_CLUSTER_MAX pages are isolated so migrate_pfn is generally\nnot aligned. This allows isolate_migratepages() to call pfn_to_page() on\nan invalid PFN which can result in a crash. This was originally reported\nagainst a 3.0-based kernel with the following trace in a crash dump.\n\nPID: 9902 TASK: d47aecd0 CPU: 0 COMMAND: \"memcg_process_s\"\n #0 [d72d3ad0] crash_kexec at c028cfdb\n #1 [d72d3b24] oops_end at c05c5322\n #2 [d72d3b38] __bad_area_nosemaphore at c0227e60\n #3 [d72d3bec] bad_area at c0227fb6\n #4 [d72d3c00] do_page_fault at c05c72ec\n #5 [d72d3c80] error_code (via page_fault) at c05c47a4\n EAX: 00000000 EBX: 000c0000 ECX: 00000001 EDX: 00000807 EBP: 000c0000\n DS: 007b ESI: 00000001 ES: 007b EDI: f3000a80 GS: 6f50\n CS: 0060 EIP: c030b15a ERR: ffffffff EFLAGS: 00010002\n #6 [d72d3cb4] isolate_migratepages at c030b15a\n #7 [d72d3d14] zone_watermark_ok at c02d26cb\n #8 [d72d3d2c] compact_zone at c030b8de\n #9 [d72d3d68] compact_zone_order at c030bba1\n#10 [d72d3db4] try_to_compact_pages at c030bc84\n#11 [d72d3ddc] __alloc_pages_direct_compact at c02d61e7\n#12 [d72d3e08] __alloc_pages_slowpath at c02d66c7\n#13 [d72d3e78] __alloc_pages_nodemask at c02d6a97\n#14 [d72d3eb8] alloc_pages_vma at c030a845\n#15 [d72d3ed4] do_huge_pmd_anonymous_page at c03178eb\n#16 [d72d3f00] handle_mm_fault at c02f36c6\n#17 [d72d3f30] do_page_fault at c05c70ed\n#18 [d72d3fb0] error_code (via page_fault) at c05c47a4\n EAX: b71ff000 EBX: 00000001 ECX: 00001600 EDX: 00000431\n DS: 007b ESI: 08048950 ES: 007b EDI: bfaa3788\n SS: 007b ESP: bfaa36e0 EBP: bfaa3828 GS: 6f50\n CS: 0073 EIP: 080487c8 ERR: ffffffff EFLAGS: 00010202\n\nIt was also reported by Herbert van den Bergh against 3.1-based kernel\nwith the following snippet from the console log.\n\nBUG: unable to handle kernel paging request at 01c00008\nIP: [\u003cc0522399\u003e] isolate_migratepages+0x119/0x390\n*pdpt \u003d 000000002f7ce001 *pde \u003d 0000000000000000\n\nIt is expected that it also affects 3.2.x and current mainline.\n\nThe problem is that pfn_valid is only called on the first PFN being\nchecked and that PFN is not necessarily aligned. Lets say we have a case\nlike this\n\nH \u003d MAX_ORDER_NR_PAGES boundary\n| \u003d pageblock boundary\nm \u003d cc-\u003emigrate_pfn\nf \u003d cc-\u003efree_pfn\no \u003d memory hole\n\nH------|------H------|----m-Hoooooo|ooooooH-f----|------H\n\nThe migrate_pfn is just below a memory hole and the free scanner is beyond\nthe hole. When isolate_migratepages started, it scans from migrate_pfn to\nmigrate_pfn+pageblock_nr_pages which is now in a memory hole. It checks\npfn_valid() on the first PFN but then scans into the hole where there are\nnot necessarily valid struct pages.\n\nThis patch ensures that isolate_migratepages calls pfn_valid when\nnecessary.\n\nReported-by: Herbert van den Bergh \u003cherbert.van.den.bergh@oracle.com\u003e\nTested-by: Herbert van den Bergh \u003cherbert.van.den.bergh@oracle.com\u003e\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nAcked-by: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3deaa7190a8da38453c4fabd9dec7f66d17fff67", "tree": "23c522d5661bf7e73a39718eaf4eb547cf02b086", "parents": [ "55ca6140e9bb307efc97a9301a4f501de02a6fd6" ], "author": { "name": "Shaohua Li", "email": "shaohua.li@intel.com", "time": "Fri Feb 03 15:37:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:41 2012 -0800" }, "message": "readahead: fix pipeline break caused by block plug\n\nHerbert Poetzl reported a performance regression since 2.6.39. The test\nis a simple dd read, but with big block size. The reason is:\n\nT1: ra (A, A+128k), (A+128k, A+256k)\nT2: lock_page for page A, submit the 256k\nT3: hit page A+128K, ra (A+256k, A+384). the range isn\u0027t submitted\nbecause of plug and there isn\u0027t any lock_page till we hit page A+256k\nbecause all pages from A to A+256k is in memory\nT4: hit page A+256k, ra (A+384, A+ 512). Because of plug, the range isn\u0027t\nsubmitted again.\nT5: lock_page A+256k, so (A+256k, A+512k) will be submitted. The task is\nwaitting for (A+256k, A+512k) finish.\n\nThere is no request to disk in T3 and T4, so readahead pipeline breaks.\n\nWe really don\u0027t need block plug for generic_file_aio_read() for buffered\nI/O. The readahead already has plug and has fine grained control when I/O\nshould be submitted. Deleting plug for buffered I/O fixes the regression.\n\nOne side effect is plug makes the request size 256k, the size is 128k\nwithout it. This is because default ra size is 128k and not a reason we\nneed plug here.\n\nVivek said:\n\n: We submit some readahead IO to device request queue but because of nested\n: plug, queue never gets unplugged. When read logic reaches a page which is\n: not in page cache, it waits for page to be read from the disk\n: (lock_page_killable()) and that time we flush the plug list.\n:\n: So effectively read ahead logic is kind of broken in parts because of\n: nested plugging. Removing top level plug (generic_file_aio_read()) for\n: buffered reads, will allow unplugging queue earlier for readahead.\n\nSigned-off-by: Shaohua Li \u003cshaohua.li@intel.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nReported-by: Herbert Poetzl \u003cherbert@13thfloor.at\u003e\nTested-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "55ca6140e9bb307efc97a9301a4f501de02a6fd6", "tree": "f0cc42df52d35a0c7d3bd2a074219eaf4a84e6a7", "parents": [ "cbcb8346054073d000ecac324763372d6abd44ac" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Fri Feb 03 15:37:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:41 2012 -0800" }, "message": "kprobes: fix a memory leak in function pre_handler_kretprobe()\n\nIn function pre_handler_kretprobe(), the allocated kretprobe_instance\nobject will get leaked if the entry_handler callback returns non-zero.\nThis may cause all the preallocated kretprobe_instance objects exhausted.\n\nThis issue can be reproduced by changing\nsamples/kprobes/kretprobe_example.c to probe \"mutex_unlock\". And the fix\nis straightforward: just put the allocated kretprobe_instance object back\nonto the free_instances list.\n\n[akpm@linux-foundation.org: use raw_spin_lock/unlock]\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nAcked-by: Jim Keniston \u003cjkenisto@us.ibm.com\u003e\nAcked-by: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Anil S Keshavamurthy \u003canil.s.keshavamurthy@intel.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cbcb8346054073d000ecac324763372d6abd44ac", "tree": "2a7f162e90ad898cea1e747bd1fcea82f882e7f2", "parents": [ "92618184cb92c5b39d4d8573572d576f9ccb3c28" ], "author": { "name": "Samuel Thibault", "email": "samuel.thibault@ens-lyon.org", "time": "Fri Feb 03 15:37:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:41 2012 -0800" }, "message": "drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer\n\nKDFONTOP(GET) currently fails with EIO when being run in a 32bit userland\nwith a 64bit kernel if the font width is not 8.\n\nThis is because of the setting of the KD_FONT_FLAG_OLD flag, which makes\ncon_font_get return EIO in such case.\n\nThis flag should *not* be set for KDFONTOP, since it\u0027s actually the whole\npoint of this flag (see comment in con_font_set for instance).\n\nSigned-off-by: Samuel Thibault \u003csamuel.thibault@ens-lyon.org\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Arthur Taylor \u003cart@ified.ca\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Jiri Olsa \u003cjolsa@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "92618184cb92c5b39d4d8573572d576f9ccb3c28", "tree": "c2cd2a7e360d6879ccc871df125a8de725949a53", "parents": [ "99f02ef1f18631eb0a4e0ea0a3d56878dbcb4b90" ], "author": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Fri Feb 03 15:37:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:41 2012 -0800" }, "message": "lkdtm: avoid calling lkdtm_do_action() with spinlock held\n\nlkdtm_do_action() may call sleeping functions like kmalloc(), so do not\ncall it with spin lock held.\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Greg Kroah-Hartman \u003cgreg@kroah.com\u003e\nReviewed-by: Dave Young \u003cdyoung@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "99f02ef1f18631eb0a4e0ea0a3d56878dbcb4b90", "tree": "1d08f77be2c89e3ed6a92caebbcdf02f85ba1447", "parents": [ "82b3f2a7171731cce62f25058d25afb91a14710c" ], "author": { "name": "Carsten Otte", "email": "carsteno@de.ibm.com", "time": "Fri Feb 03 15:37:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:41 2012 -0800" }, "message": "mm/filemap_xip.c: fix race condition in xip_file_fault()\n\nFix a race condition that shows in conjunction with xip_file_fault() when\ntwo threads of the same user process fault on the same memory page.\n\nIn this case, the race winner will install the page table entry and the\nunlucky loser will cause an oops: xip_file_fault calls vm_insert_pfn (via\nvm_insert_mixed) which drops out at this check:\n\n\tretval \u003d -EBUSY;\n\tif (!pte_none(*pte))\n\t\tgoto out_unlock;\n\nThe resulting -EBUSY return value will trigger a BUG_ON() in\nxip_file_fault.\n\nThis fix simply considers the fault as fixed in this case, because the\nrace winner has successfully installed the pte.\n\n[akpm@linux-foundation.org: use conventional (and consistent) comment layout]\nReported-by: David Sadler \u003cdsadler@us.ibm.com\u003e\nSigned-off-by: Carsten Otte \u003ccotte@de.ibm.com\u003e\nReported-by: Louis Alex Eisner \u003cleisner@cs.ucsd.edu\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "82b3f2a7171731cce62f25058d25afb91a14710c", "tree": "a8837d2d8640f1607611257bd41fded4ab2a56e8", "parents": [ "31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Fri Feb 03 15:37:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "mm/memcontrol.c: fix warning with CONFIG_NUMA\u003dn\n\nmm/memcontrol.c: In function \u0027memcg_check_events\u0027:\nmm/memcontrol.c:779: warning: unused variable \u0027do_numainfo\u0027\n\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Hiroyuki KAMEZAWA \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688", "tree": "95c057390ec5466082ad295a991f585174d0e3d3", "parents": [ "35512ecaef03250fe50ad81430dd467f01d9a96b" ], "author": { "name": "Fabio Baltieri", "email": "fabio.baltieri@gmail.com", "time": "Fri Feb 03 15:37:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "avr32: select generic atomic64_t support\n\nEnable use of the generic atomic64 implementation on AVR32 platforms.\nWithout this the kernel fails to build as the architecture does not\nprovide its version.\n\nSigned-off-by: Fabio Baltieri \u003cfabio.baltieri@gmail.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@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": "35512ecaef03250fe50ad81430dd467f01d9a96b", "tree": "66ba9202c36c4267f765b8980f2c70d7c3eb4b90", "parents": [ "a1b58c237b73f10221b31e05b47a6565558207ef" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Fri Feb 03 15:37:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "mm: postpone migrated page mapping reset\n\nPostpone resetting page-\u003emapping until the final remove_migration_ptes().\nOtherwise the expression PageAnon(migration_entry_to_page(entry)) does not\nwork.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@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": "a1b58c237b73f10221b31e05b47a6565558207ef", "tree": "ad0651849cc19bb894a3f7d312df4e0c54e6bbd8", "parents": [ "070f420b35a2c078ca2bd2a0d31dd7b5001d411c" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Fri Feb 03 15:37:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "xtensa: fix memscan()\n\nDefining memscan() as memchr() is wrong, because the return values of\nmemscan() and memchr() are different when the character is not found. So\nuse the generic memscan() implementation to fix this.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "070f420b35a2c078ca2bd2a0d31dd7b5001d411c", "tree": "935a9c9ba9f9b2082b3ed75a6cad8d7974eb7d9a", "parents": [ "cdb7232b29229ecf1cc89764d75074eaee63ce32" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Feb 03 15:37:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "MAINTAINERS: update lguest F: patterns\n\ncommit 07fe9977b623 (\"lguest: move the lguest tool to the tools\ndirectory\") moved the files, update the patterns. Sort F: patterns\nalphabetically too.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Davidlohr Bueso \u003cdave@gnu.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cdb7232b29229ecf1cc89764d75074eaee63ce32", "tree": "8aa8b97e527f6976b0d1c782495726c485abcfe4", "parents": [ "0960e7d13f5d33e4a8201b6c546ce60a2c6faba4" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Feb 03 15:37:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "MAINTAINERS: remove staging sections\n\nTwo commits moved files from staging to drivers/media/\n\ncommit d6ce55de3abcc (\"[media] move cx25821 out of staging\")\ncommit be30497085080 (\"[media] move tm6000 to drivers/media/video\")\n\nRemove the sections.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0960e7d13f5d33e4a8201b6c546ce60a2c6faba4", "tree": "a362bdd2556de74f2d4d4e57fd49927c22fec4c2", "parents": [ "20d16fef95fb2924228dce0078fdfec5429f84f2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Feb 03 15:37:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "MAINTAINERS: remove iMX5 section\n\ncommit 784a90c0a7d8f5 (\"ARM i.MX: Merge i.MX5 support into mach-imx\")\nmerged the files, remove the iMX5 section.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Amit Kucheria \u003camit.kucheria@canonical.com\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20d16fef95fb2924228dce0078fdfec5429f84f2", "tree": "23a24968309a22d91f2d12a0bb460b61b9a09ad4", "parents": [ "6c073a7ee250118b8be3a2379c96fd7f78382b06" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Feb 03 15:37:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "MAINTAINERS: update partitions block F: patterns\n\nCommit 9be96f3fd101 (\"move fs/partitions to block/\") moved the files,\nupdate the patterns.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f", "tree": "e8477a5486d5ecb98732e874c5092ce752c65577", "parents": [ "7f06db34e55af8fc33cf3d6d46d869cb7a372b5d", "b370d29ea7565a638ccf85389488364b5abb39fa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 12:41:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 12:41:31 2012 -0800" }, "message": "Merge tag \u0027kmemleak-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux\n\nTrivial kmemleak bug-fixes:\n\n - Early logging doesn\u0027t stop when kmemleak is off by default.\n - Zero-size scanning areas should be ignored (currently it prints a\n warning).\n\n* tag \u0027kmemleak-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:\n kmemleak: Disable early logging when kmemleak is off by default\n kmemleak: Only scan non-zero-size areas\n" }, { "commit": "7f06db34e55af8fc33cf3d6d46d869cb7a372b5d", "tree": "ae4025ce892c9aa02f02141b0b38639e801b0148", "parents": [ "6c073a7ee250118b8be3a2379c96fd7f78382b06", "b5bcc189401c815988b7dd37611fc56f40c9139d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 10:06:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 10:06:15 2012 -0800" }, "message": "Merge tag \u0027sound-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nsound fixes for 3.3-rc3\n\nMost of commits are either regression fixes for varioud HD-audio\ncodecs or small ASoC fixes. Also a trivial build fix is included.\n\n* tag \u0027sound-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Disable dynamic-power control for VIA as default\n ALSA: hda - Allow analog low-current mode when dynamic power-control is on\n ALSA: hda - Fix the logic to detect VIA analog low-current mode\n ALSA: hda - Check power-state before changing in patch_via.c\n ALSA: HDA: Fix duplicated output to more than one codec\n ALSA: hda - Fix calling cs_automic twice for Cirrus codecs.\n ALSA: HDA: Remove quirk for Toshiba Qosmio G50\n ALSA: HDA: Fix jack creation for codecs with front and rear Line In\n ALSA: hda - Apply 0x0f-VREF fix to all ASUS laptops with ALC861/660\n ASoC: neo1973_wm8753: remove references to the neo1973-gta01 machine\n ALSA: Add #ifdef CONFIG_PCI guard for snd_pci_quirk_* functions\n ASoC: wm_hubs: fix wrong bits for LINEOUT2 N/P mixer\n ALSA: HDA: Remove quirk for Asus N53Jq\n ASoC: wm_hubs: Enable line out VMID buffer for single ended line outputs\n ASoC: wm5100: Mark register cache as dirty when regulators are disabled\n ASoC: wm8962: Mark register cache as dirty when regulators are disabled\n ASoC: wm8996: Mark register cache as dirty when regulators are disabled\n ASoC: wm5100: Fix microphone configuration\n ASoC: wm5100: Make sure we switch to button reporting mode\n" }, { "commit": "2bd05db718cf452fe235c7c08083b2e60f787f3a", "tree": "b733153a25641ff8672fd608d92f65affe834dfd", "parents": [ "f8447d6c213273b444c81eaa2449f55510229d4f" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Sat Jan 14 20:58:44 2012 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Feb 03 19:03:50 2012 +0100" }, "message": "mfd: Avoid twl6040-codec PLL reconfiguration when not needed\n\nDo not reconfigure the PLL in case it has been configured already\nwith the requested parameters.\nIn case of different PLL configuration do only the needed changes.\nThis can save considerable amount of time since we can avoid the\ndefined protocol (with delays) for the PLL configuration.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "f8447d6c213273b444c81eaa2449f55510229d4f", "tree": "b5d7bcb01c892cfdf2b00215e12d2ad10b1d4003", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Sat Jan 14 20:58:43 2012 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Feb 03 19:03:44 2012 +0100" }, "message": "mfd: Store twl6040-codec mclk configuration\n\nStore the last used mclk configuration for the PLL.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "3af336376f77859da84bb1156ef29d5337b316a9", "tree": "31e6e0efc8b66c2212f834aeaa041052febd5076", "parents": [ "ebfded8c4b34caea450709ce467e67483fa4d8df" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Nov 04 21:27:32 2011 +0300" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Fri Feb 03 09:07:00 2012 -0800" }, "message": "IB/srpt: Fix ERR_PTR() vs. NULL checking confusion\n\ntransport_init_session() and target_fabric_configfs_init() don\u0027t\nreturn NULL pointers, they only return ERR_PTRs or valid pointers.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "5a97d0ae5b5d78727b87965cba84194a9f1e06ce", "tree": "db73153f836278d74882999ca2252bdc11a2a24d", "parents": [ "6d3ec1ae6cdcda185bd9452b2daed5145e2493a5" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Feb 03 11:08:05 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 03 15:58:46 2012 +0000" }, "message": "ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers\n\n__kuser_cmpxchg64 has a return path using bx lr to get back to the caller.\nThis is actually ok since the code in question is predicated on\nCONFIG_CPU_32v6K, but for the sake of consistency using the usr_ret\nmacro is probably better.\n\nAcked-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "82b982c9a697e7be0745523a53334fe38a4582c8", "tree": "5b1c34207eafc8262161619fa54e7aca38e9339d", "parents": [ "7a0a27d2ce38aee19a31fee8c12095f586eed393" ], "author": { "name": "Igor Murzov", "email": "intergalactic.anonymous@gmail.com", "time": "Fri Feb 03 00:19:07 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Feb 03 00:22:43 2012 -0800" }, "message": "Input: i8042 - add Lenovo Ideapad U455 to \u0027reset\u0027 blacklist\n\nFrom 2d5a38a56453421e82428155f4b00303f3fb19b2 Mon Sep 17 00:00:00 2001\nFrom: Igor Murzov \u003ce-mail@date.by\u003e\nDate: Wed, 1 Feb 2012 03:11:53 +0400\nSubject: [PATCH] Input: i8042 - add Lenovo Ideapad U455 to \u0027reset\u0027 blacklist\n\nLenovo Ideapad U455 needs to be in the reset quirk list for its\ntouchpad\u0027s proper function.\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d40672\n\nSigned-off-by: Igor Murzov \u003ce-mail@date.by\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "6c073a7ee250118b8be3a2379c96fd7f78382b06", "tree": "b398bd9cad821a3543df835e5a0110f270acafb9", "parents": [ "ff05f603c3238010769787f3ba54c48c290ed3e5", "d23a4b3fd6ef70b80411b39b8c8bc548a219ce70" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 15:47:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 15:47:33 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: fix safety of rbd_put_client()\n rbd: fix a memory leak in rbd_get_client()\n ceph: create a new session lock to avoid lock inversion\n ceph: fix length validation in parse_reply_info()\n ceph: initialize client debugfs outside of monc-\u003emutex\n ceph: change \"ceph.layout\" xattr to be \"ceph.file.layout\"\n" }, { "commit": "ff05f603c3238010769787f3ba54c48c290ed3e5", "tree": "7acaeb29f5d5b10c6fdb3727e61c42143de18737", "parents": [ "8cdb878dcb359fd1137e9abdee9322f5e9bcfdf8" ], "author": { "name": "Josh Triplett", "email": "josh@joshtriplett.org", "time": "Thu Feb 02 15:29:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 15:43:40 2012 -0800" }, "message": "include/linux/lp8727.h: Remove executable bit\n\nSigned-off-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de47a4176c532ef5961b8a46a2d541a3517412d3", "tree": "6ceecd645cbc662c47d2b00478bcb69409353734", "parents": [ "2a73ca8208197d03f78d680b3c7953b897e91eb6" ], "author": { "name": "Shirish Pargaonkar", "email": "shirishpargaonkar@gmail.com", "time": "Thu Feb 02 15:28:28 2012 -0600" }, "committer": { "name": "Steve French", "email": "smfrench@gmail.com", "time": "Thu Feb 02 16:59:09 2012 -0600" }, "message": "cifs: Fix oops in session setup code for null user mounts\n\nFor null user mounts, do not invoke string length function\nduring session setup.\n\nCc: \u003cstable@kernel.org\nReported-and-Tested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nAcked-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Shirish Pargaonkar \u003cshirishpargaonkar@gmail.com\u003e\nSigned-off-by: Steve French \u003csmfrench@gmail.com\u003e\n" }, { "commit": "d23a4b3fd6ef70b80411b39b8c8bc548a219ce70", "tree": "f42dbc4c8544acce987e35df5b3002f1def54cff", "parents": [ "97bb59a03dd6767fcc00be09b0c6d9e5294eeea6" ], "author": { "name": "Alex Elder", "email": "elder@dreamhost.com", "time": "Sun Jan 29 13:57:43 2012 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:56:59 2012 -0800" }, "message": "rbd: fix safety of rbd_put_client()\n\nThe rbd_client structure uses a kref to arrange for cleaning up and\nfreeing an instance when its last reference is dropped. The cleanup\nroutine is rbd_client_release(), and one of the things it does is\ndelete the rbd_client from rbd_client_list. It acquires node_lock\nto do so, but the way it is done is still not safe.\n\nThe problem is that when attempting to reuse an existing rbd_client,\nthe structure found might already be in the process of getting\ndestroyed and cleaned up.\n\nHere\u0027s the scenario, with \"CLIENT\" representing an existing\nrbd_client that\u0027s involved in the race:\n\n Thread on CPU A | Thread on CPU B\n --------------- | ---------------\n rbd_put_client(CLIENT) | rbd_get_client()\n kref_put() | (acquires node_lock)\n kref-\u003erefcount becomes 0 | __rbd_client_find() returns CLIENT\n calls rbd_client_release() | kref_get(\u0026CLIENT-\u003ekref);\n | (releases node_lock)\n (acquires node_lock) |\n deletes CLIENT from list | ...and starts using CLIENT...\n (releases node_lock) |\n and frees CLIENT | \u003c-- but CLIENT gets freed here\n\nFix this by having rbd_put_client() acquire node_lock. The result\ncould still be improved, but at least it avoids this problem.\n\nSigned-off-by: Alex Elder \u003celder@dreamhost.com\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "ebfded8c4b34caea450709ce467e67483fa4d8df", "tree": "8aebca3afbf674f0901968d12122ec35eae34496", "parents": [ "f225066b64eaffe3a51ee488fb750c82fbcd971c" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Thu Feb 02 12:55:59 2012 -0800" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Feb 02 12:55:59 2012 -0800" }, "message": "IB/srpt: Remove unneeded \u003clinux/version.h\u003e include\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "f225066b64eaffe3a51ee488fb750c82fbcd971c", "tree": "59f61ecdcdc8b2e371044c1a31eaafa1c83cb093", "parents": [ "486d8b9f88cd0871a716e2f16873e811ee6c1ece" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Feb 02 12:55:58 2012 -0800" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Feb 02 12:55:58 2012 -0800" }, "message": "IB/srpt: Use ARRAY_SIZE() instead of open-coding\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "486d8b9f88cd0871a716e2f16873e811ee6c1ece", "tree": "7602eac925eeee16302b8d2a50077e9e3ccc2217", "parents": [ "18d3e0d7507949d776e50667d0a4e44b13d3e1ac" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Feb 02 12:55:58 2012 -0800" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Feb 02 12:55:58 2012 -0800" }, "message": "IB/srpt: Use DEFINE_SPINLOCK()/LIST_HEAD()\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n\n" }, { "commit": "8cdb878dcb359fd1137e9abdee9322f5e9bcfdf8", "tree": "146afc01f3c1d7cbc944328484d077032bc53bfd", "parents": [ "24b36da33c64368775f4ef9386d44dce1d2bc8cf" ], "author": { "name": "Christopher Yeoh", "email": "cyeoh@au1.ibm.com", "time": "Thu Feb 02 11:34:09 2012 +1030" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 12:55:17 2012 -0800" }, "message": "Fix race in process_vm_rw_core\n\nThis fixes the race in process_vm_core found by Oleg (see\n\n http://article.gmane.org/gmane.linux.kernel/1235667/\n\nfor details).\n\nThis has been updated since I last sent it as the creation of the new\nmm_access() function did almost exactly the same thing as parts of the\nprevious version of this patch did.\n\nIn order to use mm_access() even when /proc isn\u0027t enabled, we move it to\nkernel/fork.c where other related process mm access functions already\nare.\n\nSigned-off-by: Chris Yeoh \u003cyeohc@au1.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "97bb59a03dd6767fcc00be09b0c6d9e5294eeea6", "tree": "f04006e8040913d49fb1841ed93abed6d84308a1", "parents": [ "d8fb02abdc39f92a1066313e2b17047876afa8f9" ], "author": { "name": "Alex Elder", "email": "elder@dreamhost.com", "time": "Tue Jan 24 10:08:36 2012 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:49:27 2012 -0800" }, "message": "rbd: fix a memory leak in rbd_get_client()\n\nIf an existing rbd client is found to be suitable for use in\nrbd_get_client(), the rbd_options structure is not being\nfreed as it should. Fix that.\n\nSigned-off-by: Alex Elder \u003celder@dreamhost.com\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "d8fb02abdc39f92a1066313e2b17047876afa8f9", "tree": "32f8126683dd185411b701b79d23900cf6c02035", "parents": [ "32852a81bccd9e3d1953b894966393d1b546576d" ], "author": { "name": "Alex Elder", "email": "elder@dreamhost.com", "time": "Thu Jan 12 17:48:10 2012 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:49:19 2012 -0800" }, "message": "ceph: create a new session lock to avoid lock inversion\n\nLockdep was reporting a possible circular lock dependency in\ndentry_lease_is_valid(). That function needs to sample the\nsession\u0027s s_cap_gen and and s_cap_ttl fields coherently, but needs\nto do so while holding a dentry lock. The s_cap_lock field was\nbeing used to protect the two fields, but that can\u0027t be taken while\nholding a lock on a dentry within the session.\n\nIn most cases, the s_cap_gen and s_cap_ttl fields only get operated\non separately. But in three cases they need to be updated together.\nImplement a new lock to protect the spots updating both fields\natomically is required.\n\nSigned-off-by: Alex Elder \u003celder@dreamhost.com\u003e\nReviewed-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "32852a81bccd9e3d1953b894966393d1b546576d", "tree": "8c21ce9f1a1e6ecfbeafdcc8552b77b3587bca5b", "parents": [ "ab434b60ab07f8c44246b6fb0cddee436687a09a" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Sat Jan 14 22:20:59 2012 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:49:11 2012 -0800" }, "message": "ceph: fix length validation in parse_reply_info()\n\n\"len\" is read from network and thus needs validation. Otherwise, given\na bogus \"len\" value, p+len could be an out-of-bounds pointer, which is\nused in further parsing.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "ab434b60ab07f8c44246b6fb0cddee436687a09a", "tree": "2a680aca91c4906f28cda57093ac76b1e588de5d", "parents": [ "114fc47492e23d93653e4a16664833e98d62a563" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Jan 13 22:22:03 2012 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:49:01 2012 -0800" }, "message": "ceph: initialize client debugfs outside of monc-\u003emutex\n\nInitializing debufs under monc-\u003emutex introduces a lock dependency for\nsb-\u003es_type-\u003ei_mutex_key, which (combined with several other dependencies)\nleads to an annoying lockdep warning. There\u0027s no particular reason to do\nthe debugfs setup under this lock, so move it out.\n\nIt used to be the case that our first monmap could come from the OSD; that\nis no longer the case with recent servers, so we will reliably set up the\nclient entry during the initial authentication.\n\nWe don\u0027t have to worry about racing with debugfs teardown by\nceph_debugfs_client_cleanup() because ceph_destroy_client() calls\nceph_msgr_flush() first, which will wait for the message dispatch work\nto complete (and the debugfs init to complete).\n\nFixes: #1940\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "114fc47492e23d93653e4a16664833e98d62a563", "tree": "c5ff822c89193cc6cad952cf24a06cd4a1f706eb", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610" ], "author": { "name": "Alex Elder", "email": "elder@dreamhost.com", "time": "Wed Jan 11 17:41:01 2012 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:48:52 2012 -0800" }, "message": "ceph: change \"ceph.layout\" xattr to be \"ceph.file.layout\"\n\nThe virtual extended attribute named \"ceph.layout\" is meaningful\nonly for regular files. Change its name to be \"ceph.file.layout\" to\nmore directly reflect that in the ceph xattr namespace. Preserve\nthe old \"ceph.layout\" name for the time being (until we decide it\u0027s\nsafe to get rid of it entirely).\n\nAdd a missing initializer for \"readonly\" in the terminating entry.\n\nSigned-off-by: Alex Elder \u003celder@dreamhost.com\u003e\nReviewed-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "24b36da33c64368775f4ef9386d44dce1d2bc8cf", "tree": "10d694d7ea4a32ce98d6b1dd211a2afffe07b34a", "parents": [ "c84e295b304f7359ee89645d099d79d3a4648c0b", "52b53a0bf8026a322cfa6cfec6a10dd31fef8752" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:19:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:19:03 2012 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/radeon/kms/blit: fix blit copy for very large buffers\n drm/radeon/kms: fix TRAVIS panel setup\n drm/radeon: fix use after free in ATRM bios reading code.\n drm/radeon/kms: Fix device tree linkage of DP i2c buses too\n drm/radeon: Set DESKTOP_HEIGHT register to the framebuffer (not mode) height.\n drm/radeon/kms: disable output polling when suspended\n drm/nv50/pm: signedness bug in nv50_pm_clocks_pre()\n drm/nouveau/gem: fix fence_sync race / oops\n drm/nouveau: fix typo on mxmdcb option\n drm/nouveau/mxm: pretend to succeed, even if we can\u0027t shadow the MXM-SIS\n drm/nouveau/disp: check that panel power gpio is enabled at init time\n" }, { "commit": "c84e295b304f7359ee89645d099d79d3a4648c0b", "tree": "f446c55611dd906c012db8ba5fb9e8b2e031316d", "parents": [ "2f2fde927243bde5fd106da692efef34be12f81c", "9afc416517f36b3b0b109e6590d0b74468fd80f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:18:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:18:18 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\n* \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n Revert \"microblaze: Add topology init\"\n" }, { "commit": "2f2fde927243bde5fd106da692efef34be12f81c", "tree": "28e69ca8fa227b1ba53e3bf4ddd42340499e7fe7", "parents": [ "bd3ce7d57c380af110c86d19e256115d0e7053ca", "b0f4c4b32c8e3aa0d44fc4dd6c40a9a9a8d66b63", "45179fec946dd554f74e950d2278dabd5ad23fd3", "cb297a3e433dbdcf7ad81e0564e7b804c941ff0d", "e6d36a653becc7bbc643c399a77882e02bf552cb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:11:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:11:13 2012 -0800" }, "message": "Merge branches \u0027core-urgent-for-linus\u0027, \u0027perf-urgent-for-linus\u0027, \u0027sched-urgent-for-linus\u0027 and \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n bugs, x86: Fix printk levels for panic, softlockups and stack dumps\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf top: Fix number of samples displayed\n perf tools: Fix strlen() bug in perf_event__synthesize_event_type()\n perf tools: Fix broken build by defining _GNU_SOURCE in Makefile\n x86/dumpstack: Remove unneeded check in dump_trace()\n perf: Fix broken interrupt rate throttling\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched/rt: Fix task stack corruption under __ARCH_WANT_INTERRUPTS_ON_CTXSW\n sched: Fix ancient race in do_exit()\n sched/nohz: Fix nohz cpu idle load balancing state with cpu hotplug\n sched/s390: Fix compile error in sched/core.c\n sched: Fix rq-\u003enr_uninterruptible update race\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/reboot: Remove VersaLogic Menlow reboot quirk\n x86/reboot: Skip DMI checks if reboot set by user\n x86: Properly parenthesize cmpxchg() macro arguments\n" }, { "commit": "6d3ec1ae6cdcda185bd9452b2daed5145e2493a5", "tree": "dabf4577ba47d2f7b70741c94353c94f1770b9f8", "parents": [ "91756acb58b17aee68d055fc15b1e2550ff00801" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Jan 25 11:54:22 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 02 17:37:42 2012 +0000" }, "message": "ARM: 7302/1: Add TLB flushing for both entries in a PMD\n\nLinux uses two PMD entries for a PTE with the classic page table format,\ncovering 2MB range. However, the __pte_free_tlb() function only adds a\nsingle TLB flush corresponding to 1MB range covering \u0027addr\u0027. On\nCortex-A15, level 1 entries can be cached by the TLB independently of\nthe level 2 entries and without additional flushing a PMD entry would be\nleft pointing at the wrong PTE. The patch limits the TLB flushing range\nto two 4KB pages around the 1MB boundary within PMD.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "91756acb58b17aee68d055fc15b1e2550ff00801", "tree": "6f81b4a5071441c876957a7afdff6a39a87a3a44", "parents": [ "8130b9d7b9d858aa04ce67805e8951e3cb6e9b2f" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Wed Jan 25 19:36:28 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 02 17:37:42 2012 +0000" }, "message": "ARM: 7303/1: perf: add empty NODE event definitions for Cortex-A5 and Cortex-A15\n\nCommit 89d6c0b5 (\"perf, arch: Add generic NODE cache events\") added\nempty NODE event definitions for the ARM PMU implementations. This was\nmerged along with Cortex-A5 and Cortex-A15 PMU support, so they missed\nout on the original patch.\n\nThis patch adds the empty definitions to Cortex-A5 and Cortex-A15.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8130b9d7b9d858aa04ce67805e8951e3cb6e9b2f", "tree": "0b66f2eb287b5412ef7c3d8034a64d9182fb7999", "parents": [ "247f4993a5974e6759606c4d380748eecfd273ff" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Jan 30 20:23:29 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 02 17:37:42 2012 +0000" }, "message": "ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers\n\nIf we are context switched whilst copying into a thread\u0027s\nvfp_hard_struct then the partial copy may be corrupted by the VFP\ncontext switching code (see \"ARM: vfp: flush thread hwstate before\nrestoring context from sigframe\").\n\nThis patch updates the ptrace VFP set code so that the thread state is\nflushed before the copy, therefore disabling VFP and preventing\ncorruption from occurring.\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "247f4993a5974e6759606c4d380748eecfd273ff", "tree": "79cf9e348c8274154e64d69d4373bec416cf4dee", "parents": [ "2af276dfb1722e97b190bd2e646b079a2aa674db" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Mon Jan 30 20:22:28 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 02 17:37:42 2012 +0000" }, "message": "ARM: 7307/1: vfp: fix ptrace regset modification race\n\nIn a preemptible kernel, vfp_set() can be preempted, causing the\nhardware VFP context to be switched while the thread vfp state is\nbeing read and modified. This leads to a race condition which can\ncause the thread vfp state to become corrupted if lazy VFP context\nsave occurs due to preemption in between the time thread-\u003evfpstate\nis read and the time the modified state is written back.\n\nThis may occur if preemption occurs during the execution of a\nptrace() call which modifies the VFP register state of a thread.\nSuch instances should be very rare in most realistic scenarios --\nnone has been reported, so far as I am aware. Only uniprocessor\nsystems should be affected, since VFP context save is not currently\nlazy in SMP kernels.\n\nThe problem was introduced by my earlier patch migrating to use\nregsets to implement ptrace.\n\nThis patch does a vfp_sync_hwstate() before reading\nthread-\u003evfpstate, to make sure that the thread\u0027s VFP state is not\nlive in the hardware registers while the registers are modified.\n\nThanks to Will Deacon for spotting this.\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2af276dfb1722e97b190bd2e646b079a2aa674db", "tree": "8fee4bc70d769d2d6bea25c627ff63716c3d0b20", "parents": [ "97f1040982d7935716e9a45a26ccd5cc8fe92f8c" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Jan 30 20:21:42 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 02 17:37:41 2012 +0000" }, "message": "ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe\n\nFollowing execution of a signal handler, we currently restore the VFP\ncontext from the ucontext in the signal frame. This involves copying\nfrom the user stack into the current thread\u0027s vfp_hard_struct and then\nflushing the new data out to the hardware registers.\n\nThis is problematic when using a preemptible kernel because we could be\ncontext switched whilst updating the vfp_hard_struct. If the current\nthread has made use of VFP since the last context switch, the VFP\nnotifier will copy from the hardware registers into the vfp_hard_struct,\noverwriting any data that had been partially copied by the signal code.\n\nDisabling preemption across copy_from_user calls is a terrible idea, so\ninstead we move the VFP thread flush *before* we update the\nvfp_hard_struct. Since the flushing is performed lazily, this has the\neffect of disabling VFP and clearing the CPU\u0027s VFP state pointer,\ntherefore preventing the thread from being updated with stale data on\nthe next context switch.\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nTested-by: Peter Maydell \u003cpeter.maydell@linaro.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "97f1040982d7935716e9a45a26ccd5cc8fe92f8c", "tree": "158cd337307a4a4e09a3fb5110f29ab0136bef6c", "parents": [ "3c424f359898aff48c3d5bed608ac706f8a528c3" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 29 14:55:21 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 02 17:37:41 2012 +0000" }, "message": "Revert \"ARM: 7304/1: ioremap: fix boundary check when reusing static mapping\"\n\nThis reverts commit 3c424f359898aff48c3d5bed608ac706f8a528c3.\n\nJoachim Eastwood reports:\n| \"ARM: 7304/1: ioremap: fix boundary check when reusing static mapping\"\n| Commit: 3c424f359898aff48c3d5bed608ac706f8a528c3 in Linus master\n|\n| Breaks booting on my custom AT91RM9200 board.\n| There isn\u0027t any error messages or anything that indicates what goes\n| wrong it just stops after; Uncompressing Linux... done, booting the\n| kernel.\n|\n| Reverting it makes my board boot again.\n\nand further debugging reveals:\n\nioremap: pfn\u003dfffff phys\u003dfffff000 offset\u003d400 size\u003d1000\nioremap: area c3ffdfc0: phys_addr\u003d200000 pfn\u003d200 size\u003d4000\nioremap: found: addr fef74000 \u003d\u003e fed73000 \u003d\u003e fed73400\n\nClearly, an area for pfn 0x200, 16K can\u0027t ever satisfy a request for pfn\n0xfffff. This happens because the changed if statement becomes:\n\n if (0x00200 \u003e 0xfffff ||\n 0xfffff000 + 0x400 + 0x1000-1 \u003e 0x00200000 + 0x4000-1)\nand therefore:\n if (0x00200 \u003e 0xfffff ||\n 0x000003ff \u003e 0x00203fff)\n\nThe if condition fails, and so we _believe_ that the SRAM mapping fits\nour request. Clearly that\u0027s totally bogus.\n\nMoreover, the original premise of the \u0027fix\u0027 patch was wrong:\n| The condition checking boundaries of the requested and existing\n| mappings didn\u0027t take in-page offset into consideration though,\n| which lead to obscure and hard to debug problems when requested\n| mapping crossed end of the static one.\n\nas the code immediately above this loop does:\n\n size \u003d PAGE_ALIGN(offset + size);\n\nso \u0027size\u0027 already contains the requested offset into the page.\n\nSo, revert the broken \u0027fix\u0027.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\n" }, { "commit": "52b53a0bf8026a322cfa6cfec6a10dd31fef8752", "tree": "d2247328b87baf65a3245be2ea7e430f14b2be95", "parents": [ "304a48400d9718f74ec35ae46f30868a5f4c4516" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Thu Feb 02 10:26:24 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 02 15:54:48 2012 +0000" }, "message": "drm/radeon/kms/blit: fix blit copy for very large buffers\n\nEvergreen and NI blit copy was broken if the buffer maps to a rectangle\nwhose one dimension is 16384 (max dimension allowed by these chips).\nIn the mainline kernel, the problem is exposed only when buffers are\nvery large (1G), but it\u0027s still a problem. The problem could be exposed\nfor smaller buffers if anyone modifies the algorithm for rectangle\nconstruction in r600_blit_create_rect() (the reason why someone would\nmodify that algorithm is to tune the performance of buffer moves).\n\nThe root cause was in i2f() function which only operated on range between\n0 and 16383. Fix this by extending the range of i2f() function to 0 to\n32767.\n\nWhile at it improve the function so that the range can be easily\nextended in the future (if it becomes necessary), cleanup lines\nover 80 characters, and replace in-line comments with one strategic\ncomment that explains the crux of the function.\n\nCredits to michel@daenzer.net for pointing out the root cause of\nthe bug.\n\nv2: Fix I2F_MAX_INPUT constant definition goof and warn only once\n if input argument is out of range. Edit the comment a little\n bit to avoid some linguistic confusion and make it look better\n in general.\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "304a48400d9718f74ec35ae46f30868a5f4c4516", "tree": "87b329cd11156f7596026f105e90de5431430b09", "parents": [ "de47a9cd62771e3e78954d855d2304fbad4c5a44" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Feb 02 10:18:00 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 02 15:26:50 2012 +0000" }, "message": "drm/radeon/kms: fix TRAVIS panel setup\n\nDifferent versions of the DP to LVDS bridge chip\nneed different panel mode settings depending on\nthe chip version used.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d41569\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "de47a9cd62771e3e78954d855d2304fbad4c5a44", "tree": "8fab7f0f5742ebd75eba4d333def8dbaaff01b95", "parents": [ "3f7e363249ad5f4070025f6c09fd264f93f24eab" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 02 15:25:16 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 02 15:25:16 2012 +0000" }, "message": "drm/radeon: fix use after free in ATRM bios reading code.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d45503\n\nReported-and-Debugged-by: mlambda@gmail.com\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c1c454b8691cc95aa83f19273ed7845914c70e83", "tree": "c0a6eb8a8f8f13b246a13fc39fe3050f2e7d8d63", "parents": [ "ba18311dff7933ccb9c41bbbb1ad3d70840069b5" ], "author": { "name": "K. Y. Srinivasan", "email": "kys@microsoft.com", "time": "Wed Jan 18 08:57:14 2012 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 02 10:56:11 2012 +0100" }, "message": "HID: hyperv: Properly disconnect the input device\n\nWhen we unload the mouse driver, properly disconnect the input device.\n\nSigned-off-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReported-by: Fuzhou Chen \u003cfuzhouch@microsoft.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b5bcc189401c815988b7dd37611fc56f40c9139d", "tree": "2aff7c8af0e0f0db40071d7758d2bbe918577ec5", "parents": [ "e9d010c2e8f03952e67a6fd8aed0f0dc92084ccc" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Feb 02 10:30:17 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Feb 02 10:34:06 2012 +0100" }, "message": "ALSA: hda - Disable dynamic-power control for VIA as default\n\nSince the dynamic pin power-control and the analog low-current mode\nmay lead to pop-noise, it\u0027s safer to set it off as default.\n\nBugzilla: https://bugzilla.novell.com/show_bug.cgi?id\u003d741128\n\nCc: \u003cstable@kernel.org\u003e [v3.1+]\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "e9d010c2e8f03952e67a6fd8aed0f0dc92084ccc", "tree": "ef54a3c768f43e761577dd67d682cc680865981a", "parents": [ "924339239fd5ba3e505f9420d41f0939196f3530" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Feb 01 10:33:23 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Feb 02 10:18:09 2012 +0100" }, "message": "ALSA: hda - Allow analog low-current mode when dynamic power-control is on\n\nVIA codecs have several different power-saving features, and one of\nthem is the analog low-current mode. But it turned out that the ALC\nmode causes pop-noises at each on/off time on some machines. As a\nquick workaround, disable the ALC when another power-saving feature,\nthe dynamic pin power-control, is turned off, too, since the dynamic\npower-control is already exposed as a mixer enum element so that user\ncan turn it on/off freely.\n\nBugzilla: https://bugzilla.novell.com/show_bug.cgi?id\u003d741128\n\nCc: \u003cstable@kernel.org\u003e [v3.1+]\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "924339239fd5ba3e505f9420d41f0939196f3530", "tree": "416dc6dd37ab0b29ab52ce9246b3cac5c151c5bd", "parents": [ "054d867e032daf55c3343fc6d36c5c5f1e7954db" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Jan 24 13:58:36 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Feb 02 10:16:32 2012 +0100" }, "message": "ALSA: hda - Fix the logic to detect VIA analog low-current mode\n\nThe analog low-current mode must be enabled when the no stream is\nrunning but the current detection checks it in a wrong way.\n\nBugzilla: https://bugzilla.novell.com/show_bug.cgi?id\u003d741128\n\nCc: \u003cstable@kernel.org\u003e [v3.1+]\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "054d867e032daf55c3343fc6d36c5c5f1e7954db", "tree": "016891c36c141beb4e098781a711e23f8e43d259", "parents": [ "54c2a89f60fd71b924d0f848ac892442951401a6" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Jan 24 12:25:50 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Feb 02 10:15:16 2012 +0100" }, "message": "ALSA: hda - Check power-state before changing in patch_via.c\n\nInstead of always writing AC_VERB_SET_POWER_STATE, check the current\npower-state and don\u0027t write again if the value is already set.\nThis may reduce the click noise upon the dynamic power-state change\n(e.g. in analog-input mixer).\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "ba18311dff7933ccb9c41bbbb1ad3d70840069b5", "tree": "11f4587c69f1063c3046af074d5e12d8d3eef252", "parents": [ "f62f61917d72c1fb0101ad405664f6fc868d676b" ], "author": { "name": "Ming Lei", "email": "tom.leiming@gmail.com", "time": "Thu Jan 12 17:42:22 2012 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 02 09:48:00 2012 +0100" }, "message": "HID: usbhid: fix dead lock between open and disconect\n\nThere is no reason to hold hiddev-\u003eexistancelock before\ncalling usb_deregister_dev, so move it out of the lock.\n\nThe patch fixes the lockdep warning below.\n\n[ 5733.386271] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 5733.386274] [ INFO: possible circular locking dependency detected ]\n[ 5733.386278] 3.2.0-custom-next-20120111+ #1 Not tainted\n[ 5733.386281] -------------------------------------------------------\n[ 5733.386284] khubd/186 is trying to acquire lock:\n[ 5733.386288] (minor_rwsem){++++.+}, at: [\u003cffffffffa0011a04\u003e] usb_deregister_dev+0x37/0x9e [usbcore]\n[ 5733.386311]\n[ 5733.386312] but task is already holding lock:\n[ 5733.386315] (\u0026hiddev-\u003eexistancelock){+.+...}, at: [\u003cffffffffa0094d17\u003e] hiddev_disconnect+0x26/0x87 [usbhid]\n[ 5733.386328]\n[ 5733.386329] which lock already depends on the new lock.\n[ 5733.386330]\n[ 5733.386333]\n[ 5733.386334] the existing dependency chain (in reverse order) is:\n[ 5733.386336]\n[ 5733.386337] -\u003e #1 (\u0026hiddev-\u003eexistancelock){+.+...}:\n[ 5733.386346] [\u003cffffffff81082d26\u003e] lock_acquire+0xcb/0x10e\n[ 5733.386357] [\u003cffffffff813df961\u003e] __mutex_lock_common+0x60/0x465\n[ 5733.386366] [\u003cffffffff813dfe4d\u003e] mutex_lock_nested+0x36/0x3b\n[ 5733.386371] [\u003cffffffffa0094ad6\u003e] hiddev_open+0x113/0x193 [usbhid]\n[ 5733.386378] [\u003cffffffffa0011971\u003e] usb_open+0x66/0xc2 [usbcore]\n[ 5733.386390] [\u003cffffffff8111a8b5\u003e] chrdev_open+0x12b/0x154\n[ 5733.386402] [\u003cffffffff811159a8\u003e] __dentry_open.isra.16+0x20b/0x355\n[ 5733.386408] [\u003cffffffff811165dc\u003e] nameidata_to_filp+0x43/0x4a\n[ 5733.386413] [\u003cffffffff81122ed5\u003e] do_last+0x536/0x570\n[ 5733.386419] [\u003cffffffff8112300b\u003e] path_openat+0xce/0x301\n[ 5733.386423] [\u003cffffffff81123327\u003e] do_filp_open+0x33/0x81\n[ 5733.386427] [\u003cffffffff8111664d\u003e] do_sys_open+0x6a/0xfc\n[ 5733.386431] [\u003cffffffff811166fb\u003e] sys_open+0x1c/0x1e\n[ 5733.386434] [\u003cffffffff813e7c79\u003e] system_call_fastpath+0x16/0x1b\n[ 5733.386441]\n[ 5733.386441] -\u003e #0 (minor_rwsem){++++.+}:\n[ 5733.386448] [\u003cffffffff8108255d\u003e] __lock_acquire+0xa80/0xd74\n[ 5733.386454] [\u003cffffffff81082d26\u003e] lock_acquire+0xcb/0x10e\n[ 5733.386458] [\u003cffffffff813e01f5\u003e] down_write+0x44/0x77\n[ 5733.386464] [\u003cffffffffa0011a04\u003e] usb_deregister_dev+0x37/0x9e [usbcore]\n[ 5733.386475] [\u003cffffffffa0094d2d\u003e] hiddev_disconnect+0x3c/0x87 [usbhid]\n[ 5733.386483] [\u003cffffffff8132df51\u003e] hid_disconnect+0x3f/0x54\n[ 5733.386491] [\u003cffffffff8132dfb4\u003e] hid_device_remove+0x4e/0x7a\n[ 5733.386496] [\u003cffffffff812c0957\u003e] __device_release_driver+0x81/0xcd\n[ 5733.386502] [\u003cffffffff812c09c3\u003e] device_release_driver+0x20/0x2d\n[ 5733.386507] [\u003cffffffff812c0564\u003e] bus_remove_device+0x114/0x128\n[ 5733.386512] [\u003cffffffff812bdd6f\u003e] device_del+0x131/0x183\n[ 5733.386519] [\u003cffffffff8132def3\u003e] hid_destroy_device+0x1e/0x3d\n[ 5733.386525] [\u003cffffffffa00916b0\u003e] usbhid_disconnect+0x36/0x42 [usbhid]\n[ 5733.386530] [\u003cffffffffa000fb60\u003e] usb_unbind_interface+0x57/0x11f [usbcore]\n[ 5733.386542] [\u003cffffffff812c0957\u003e] __device_release_driver+0x81/0xcd\n[ 5733.386547] [\u003cffffffff812c09c3\u003e] device_release_driver+0x20/0x2d\n[ 5733.386552] [\u003cffffffff812c0564\u003e] bus_remove_device+0x114/0x128\n[ 5733.386557] [\u003cffffffff812bdd6f\u003e] device_del+0x131/0x183\n[ 5733.386562] [\u003cffffffffa000de61\u003e] usb_disable_device+0xa8/0x1d8 [usbcore]\n[ 5733.386573] [\u003cffffffffa0006bd2\u003e] usb_disconnect+0xab/0x11f [usbcore]\n[ 5733.386583] [\u003cffffffffa0008aa0\u003e] hub_thread+0x73b/0x1157 [usbcore]\n[ 5733.386593] [\u003cffffffff8105dc0f\u003e] kthread+0x95/0x9d\n[ 5733.386601] [\u003cffffffff813e90b4\u003e] kernel_thread_helper+0x4/0x10\n[ 5733.386607]\n[ 5733.386608] other info that might help us debug this:\n[ 5733.386609]\n[ 5733.386612] Possible unsafe locking scenario:\n[ 5733.386613]\n[ 5733.386615] CPU0 CPU1\n[ 5733.386618] ---- ----\n[ 5733.386620] lock(\u0026hiddev-\u003eexistancelock);\n[ 5733.386625] lock(minor_rwsem);\n[ 5733.386630] lock(\u0026hiddev-\u003eexistancelock);\n[ 5733.386635] lock(minor_rwsem);\n[ 5733.386639]\n[ 5733.386640] *** DEADLOCK ***\n[ 5733.386641]\n[ 5733.386644] 6 locks held by khubd/186:\n[ 5733.386646] #0: (\u0026__lockdep_no_validate__){......}, at: [\u003cffffffffa00084af\u003e] hub_thread+0x14a/0x1157 [usbcore]\n[ 5733.386661] #1: (\u0026__lockdep_no_validate__){......}, at: [\u003cffffffffa0006b77\u003e] usb_disconnect+0x50/0x11f [usbcore]\n[ 5733.386677] #2: (hcd-\u003ebandwidth_mutex){+.+.+.}, at: [\u003cffffffffa0006bc8\u003e] usb_disconnect+0xa1/0x11f [usbcore]\n[ 5733.386693] #3: (\u0026__lockdep_no_validate__){......}, at: [\u003cffffffff812c09bb\u003e] device_release_driver+0x18/0x2d\n[ 5733.386704] #4: (\u0026__lockdep_no_validate__){......}, at: [\u003cffffffff812c09bb\u003e] device_release_driver+0x18/0x2d\n[ 5733.386714] #5: (\u0026hiddev-\u003eexistancelock){+.+...}, at: [\u003cffffffffa0094d17\u003e] hiddev_disconnect+0x26/0x87 [usbhid]\n[ 5733.386727]\n[ 5733.386727] stack backtrace:\n[ 5733.386731] Pid: 186, comm: khubd Not tainted 3.2.0-custom-next-20120111+ #1\n[ 5733.386734] Call Trace:\n[ 5733.386741] [\u003cffffffff81062881\u003e] ? up+0x34/0x3b\n[ 5733.386747] [\u003cffffffff813d9ef3\u003e] print_circular_bug+0x1f8/0x209\n[ 5733.386752] [\u003cffffffff8108255d\u003e] __lock_acquire+0xa80/0xd74\n[ 5733.386756] [\u003cffffffff810808b4\u003e] ? trace_hardirqs_on_caller+0x15d/0x1a3\n[ 5733.386763] [\u003cffffffff81043a3f\u003e] ? vprintk+0x3f4/0x419\n[ 5733.386774] [\u003cffffffffa0011a04\u003e] ? usb_deregister_dev+0x37/0x9e [usbcore]\n[ 5733.386779] [\u003cffffffff81082d26\u003e] lock_acquire+0xcb/0x10e\n[ 5733.386789] [\u003cffffffffa0011a04\u003e] ? usb_deregister_dev+0x37/0x9e [usbcore]\n[ 5733.386797] [\u003cffffffff813e01f5\u003e] down_write+0x44/0x77\n[ 5733.386807] [\u003cffffffffa0011a04\u003e] ? usb_deregister_dev+0x37/0x9e [usbcore]\n[ 5733.386818] [\u003cffffffffa0011a04\u003e] usb_deregister_dev+0x37/0x9e [usbcore]\n[ 5733.386825] [\u003cffffffffa0094d2d\u003e] hiddev_disconnect+0x3c/0x87 [usbhid]\n[ 5733.386830] [\u003cffffffff8132df51\u003e] hid_disconnect+0x3f/0x54\n[ 5733.386834] [\u003cffffffff8132dfb4\u003e] hid_device_remove+0x4e/0x7a\n[ 5733.386839] [\u003cffffffff812c0957\u003e] __device_release_driver+0x81/0xcd\n[ 5733.386844] [\u003cffffffff812c09c3\u003e] device_release_driver+0x20/0x2d\n[ 5733.386848] [\u003cffffffff812c0564\u003e] bus_remove_device+0x114/0x128\n[ 5733.386854] [\u003cffffffff812bdd6f\u003e] device_del+0x131/0x183\n[ 5733.386859] [\u003cffffffff8132def3\u003e] hid_destroy_device+0x1e/0x3d\n[ 5733.386865] [\u003cffffffffa00916b0\u003e] usbhid_disconnect+0x36/0x42 [usbhid]\n[ 5733.386876] [\u003cffffffffa000fb60\u003e] usb_unbind_interface+0x57/0x11f [usbcore]\n[ 5733.386882] [\u003cffffffff812c0957\u003e] __device_release_driver+0x81/0xcd\n[ 5733.386886] [\u003cffffffff812c09c3\u003e] device_release_driver+0x20/0x2d\n[ 5733.386890] [\u003cffffffff812c0564\u003e] bus_remove_device+0x114/0x128\n[ 5733.386895] [\u003cffffffff812bdd6f\u003e] device_del+0x131/0x183\n[ 5733.386905] [\u003cffffffffa000de61\u003e] usb_disable_device+0xa8/0x1d8 [usbcore]\n[ 5733.386916] [\u003cffffffffa0006bd2\u003e] usb_disconnect+0xab/0x11f [usbcore]\n[ 5733.386921] [\u003cffffffff813dff82\u003e] ? __mutex_unlock_slowpath+0x130/0x141\n[ 5733.386929] [\u003cffffffffa0008aa0\u003e] hub_thread+0x73b/0x1157 [usbcore]\n[ 5733.386935] [\u003cffffffff8106a51d\u003e] ? finish_task_switch+0x78/0x150\n[ 5733.386941] [\u003cffffffff8105e396\u003e] ? __init_waitqueue_head+0x4c/0x4c\n[ 5733.386950] [\u003cffffffffa0008365\u003e] ? usb_remote_wakeup+0x56/0x56 [usbcore]\n[ 5733.386955] [\u003cffffffff8105dc0f\u003e] kthread+0x95/0x9d\n[ 5733.386961] [\u003cffffffff813e90b4\u003e] kernel_thread_helper+0x4/0x10\n[ 5733.386966] [\u003cffffffff813e24b8\u003e] ? retint_restore_args+0x13/0x13\n[ 5733.386970] [\u003cffffffff8105db7a\u003e] ? __init_kthread_worker+0x55/0x55\n[ 5733.386974] [\u003cffffffff813e90b0\u003e] ? gs_change+0x13/0x13\n\nSigned-off-by: Ming Lei \u003cming.lei@canonical.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "94ac27a54be6a14948f0a9b3f542b4ff1faac232", "tree": "3aff7c8ba640843965ef4a7223dd4ce7ae3501a5", "parents": [ "c8ddf036d99e7fab943b7587c75a905e789ea7e7" ], "author": { "name": "Philippe Rétornaz", "email": "philippe.retornaz@epfl.ch", "time": "Tue Jan 24 14:22:01 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Feb 02 14:00:43 2012 +0530" }, "message": "i.MX SDMA: Fix burstsize settings\n\nCommit 6584cb88 (ARM i.MX dma: Fix burstsize settings) fixed\nthe mxcmmc driver but forgot to fix the SDMA driver to handle the\ncorrect burtsize.\nThis make the SD card access works again with DMA on i.MX31 boards.\n\nSigned-off-by: Philippe Rétornaz \u003cphilippe.retornaz@epfl.ch\u003e\nTested-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "7e3a70fb7bccada029c188c89bfbf3c0a63c1500", "tree": "b333d3233560bfa5b32bf2fea659ecdadd92d2b4", "parents": [ "d166370ad86b33b1111af3a0cdd7de94e03789a6" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Feb 01 10:50:05 2012 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 01 21:59:37 2012 -0700" }, "message": "gpio: Add missing spin_lock_init in gpio-ml-ioh driver\n\nThis bug was introduced by commit 54be5663\n\"gpio-ml-ioh: Support interrupt function\" which adds a spinlock to struct\nioh_gpio but never init the spinlock.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "d166370ad86b33b1111af3a0cdd7de94e03789a6", "tree": "5f7ec948fd7fbade13192aa11311bad91cde2b7a", "parents": [ "876cf5e7b9e4bae014b0fa2cc18b21bce6d99073" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Feb 01 10:51:53 2012 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 01 21:59:15 2012 -0700" }, "message": "gpio: Add missing spin_lock_init in gpio-pch driver\n\nThis bug was introduced by commit d568a681\n\"gpio-pch: add spinlock in suspend/resume processing\"\nwhich adds a spinlock to struct pch_gpio but never init the spinlock.\n\nReported-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "bd3ce7d57c380af110c86d19e256115d0e7053ca", "tree": "11ee474cab876adee5448ab7cd1ccda153d7988c", "parents": [ "da46d7dd530c5af7cff049145f0c088f5e75bdc6", "320cfa6ce0b3dc794fedfa4bae54c0f65077234d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 18:30:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 18:30:15 2012 -0800" }, "message": "Merge tag \u0027firewire-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394\n\nfirewire fixes post v3.3-rc1\n\nAdd workarounds table entries for hardware bugs in\n - FireWire part of Sound Blaster Audigy cards,\n - Ricoh PCIe 1394 controllers.\nWithout these, several protocols, e.g. AV/C, do not work on the\nAudigy, and the Ricoh PCIe controllers wouldn\u0027t work at all.\nThis does not concern the older Ricoh PCI controllers.\n\n* tag \u0027firewire-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:\n firewire: ohci: disable MSI on Ricoh controllers\n firewire: ohci: add reset packet quirk for SB Audigy\n" }, { "commit": "da46d7dd530c5af7cff049145f0c088f5e75bdc6", "tree": "e771bd6b789aa959e76894127e10e16b08bc25c7", "parents": [ "13405059e8148259a0d5b66f42e93d641a63e66a" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Feb 01 19:04:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 18:29:33 2012 -0800" }, "message": "staging: fix go7007-usb license\n\nAdd MODULE_LICENSE() as per the license in the comment at the top of the\nfile for this source module to fix build warning:\n\n WARNING: modpost: missing MODULE_LICENSE() in drivers/staging/media/go7007/go7007-usb.o\n see include/linux/module.h for more information\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Ross Cohen \u003crcohen@snurgle.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "13405059e8148259a0d5b66f42e93d641a63e66a", "tree": "8da9a1f3efd272d1a9ec710d8bc9d5e6feb9ccc7", "parents": [ "ce106ad31016b5da1168496cd0454a6290555f84" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Feb 01 18:15:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 17:28:26 2012 -0800" }, "message": "docbook: fix fatal errors in device-drivers docbook and add DMA Management section\n\nFix 2 fatal errors in the device-drivers docbook.\nAlso add some missing files from drivers/base/; since several\nof these are DMA-related, add a section for DMA Management.\n\ndocproc: drivers/base/sys.c: No such file or directory\ndocproc: drivers/tty/serial/8250.c: No such file or directory\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "876cf5e7b9e4bae014b0fa2cc18b21bce6d99073", "tree": "3a466167c9028aeb30e506ce09c6b8ab85012e4b", "parents": [ "95120d5d1bc17bdec29085186b6ab3d90e92d6f3" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Wed Feb 01 18:32:32 2012 +0530" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 01 17:05:28 2012 -0700" }, "message": "gpio: samsung: adapt to changes in gpio specifier translator function declaration\n\nCommit 15c9a0acc3f7 (of: create of_phandle_args to simplify return of phandle\nparsing data) modifies the parameter list of of_xlate function pointer declaration\nin gpio_chip. Adapt the gpio specifier translate function for this change.\n\nReported-by: Tushar Behera \u003ctushar.behera@linaro.org\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nTested-by: Karol Lewandowski \u003ck.lewandowsk@samsung.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "ce106ad31016b5da1168496cd0454a6290555f84", "tree": "07127240fcbe41ed0e2169ec2bbb79d67375b00d", "parents": [ "18d3e0d7507949d776e50667d0a4e44b13d3e1ac", "a99e7e5f36c55e561a64280f5099078c31839076" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 16:00:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 16:00:38 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n lib: Fix 32-bit sparc udiv_qrnnd() definition in mpilib\u0027s longlong.h\n lib: Fix multiple definitions of clz_tab\n lib/digsig: checks for NULL return value\n lib/mpi: added missing NULL check\n lib/mpi: added comment on divide by 0 case\n lib/mpi: check for possible zero length\n lib/digsig: pkcs_1_v1_5_decode_emsa cleanup\n lib/digsig: additional sanity checks against badly formated key payload\n lib/mpi: removed unused functions\n lib/mpi: checks for zero divisor length\n lib/mpi: return error code on dividing by zero\n lib/mpi: replaced MPI_NULL with normal NULL\n lib/mpi: added missing NULL check\n" }, { "commit": "a99e7e5f36c55e561a64280f5099078c31839076", "tree": "01c1bc431834e465ee0ae2585ea4f5a0a7442cf4", "parents": [ "c6df4b17c8539f737a6a2d7b797eac41e8e34cdc" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 00:17:55 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 02 10:34:25 2012 +1100" }, "message": "lib: Fix 32-bit sparc udiv_qrnnd() definition in mpilib\u0027s longlong.h\n\nThis copy of longlong.h is extremely dated and results in compile\nerrors on sparc32 when MPILIB is enabled, copy over the more uptodate\nimplementation from arch/sparc/math/sfp-util_32.h\n\nReported-by: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c6df4b17c8539f737a6a2d7b797eac41e8e34cdc", "tree": "7b891178267aa9486fed1197419aac57d3036b5f", "parents": [ "86f8bedc9e1a8ddb4f1d9ff1f0c1229cc0797d6d" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 00:17:54 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 02 10:34:23 2012 +1100" }, "message": "lib: Fix multiple definitions of clz_tab\n\nBoth sparc 32-bit\u0027s software divide assembler and MPILIB provide\nclz_tab[] with identical contents.\n\nBreak it out into a seperate object file and select it when\nSPARC32 or MPILIB is set.\n\nReported-by: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "18d3e0d7507949d776e50667d0a4e44b13d3e1ac", "tree": "b3adfda84ccc82a9f1df673c24c6e7db7b211dd9", "parents": [ "6d08f2c7139790c268820a2e590795cb8333181a", "f36ae342388e09361cfa43c38fd65b89687cf5db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 15:18:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 15:18:39 2012 -0800" }, "message": "Merge tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nInfiniBand/RDMA fixes for 3.3:\n\n - Fix a crash due to a regression (uninitialized refcnt) introduced in\n 3.2 with XRC support.\n - Close race in how ucma reports events when connect fails.\n - Process vendor-specific MADs in mlx4 so that eg FDR-10 data rate works.\n - Fix regression in qib caused by over-aggressive PCIe tuning.\n - Other small fixes for hardware drivers (ipath, nes, qib).\n\n* tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n RDMA/nes: Copyright update\n IB/mlx4: pass SMP vendor-specific attribute MADs to firmware\n RDMA/nes: Fix fast memory registration opcode\n RDMA/nes: Fix fast memory registration length\n RDMA/ucma: Discard all events for new connections until accepted\n IB/qib: Roll back PCIe tuning change\n IB/qib: Use GFP_ATOMIC when locks are held\n RDMA/nes: Add missing rcu_read_unlock() in nes_addr_resolve_neigh()\n RDMA/nes: Fix for sending MPA reject frame\n IB/ipath: Calling PTR_ERR() on right variable in create_file()\n RDMA/core: Fix kernel panic by always initializing qp-\u003eusecnt\n" }, { "commit": "6d08f2c7139790c268820a2e590795cb8333181a", "tree": "78b2773b8ca6949f9561af641908e4086ba193cb", "parents": [ "572d34b946bae070debd42db1143034d9687e13f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Jan 31 17:15:11 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 14:39:01 2012 -0800" }, "message": "proc: make sure mem_open() doesn\u0027t pin the target\u0027s memory\n\nOnce /proc/pid/mem is opened, the memory can\u0027t be released until\nmem_release() even if its owner exits.\n\nChange mem_open() to do atomic_inc(mm_count) + mmput(), this only\npins mm_struct. Change mem_rw() to do atomic_inc_not_zero(mm_count)\nbefore access_remote_vm(), this verifies that this mm is still alive.\n\nI am not sure what should mem_rw() return if atomic_inc_not_zero()\nfails. With this patch it returns zero to match the \"mm \u003d\u003d NULL\" case,\nmay be it should return -EINVAL like it did before e268337d.\n\nPerhaps it makes sense to add the additional fatal_signal_pending()\ncheck into the main loop, to ensure we do not hold this memory if\nthe target task was oom-killed.\n\nCc: stable@kernel.org\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "572d34b946bae070debd42db1143034d9687e13f", "tree": "b913d612090e8ec25e92451120ef64692c802264", "parents": [ "71879d3cb3dd8f2dfdefb252775c1b3ea04a3dd4" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Jan 31 17:14:54 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 14:39:01 2012 -0800" }, "message": "proc: unify mem_read() and mem_write()\n\nNo functional changes, cleanup and preparation.\n\nmem_read() and mem_write() are very similar. Move this code into the\nnew common helper, mem_rw(), which takes the additional \"int write\"\nargument.\n\nCc: stable@kernel.org\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71879d3cb3dd8f2dfdefb252775c1b3ea04a3dd4", "tree": "befc1bd5504c6d97a24a2d519de19eaa3af0906f", "parents": [ "879a5a001b62a020e074d460b3a7c0fd993f9832" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Jan 31 17:14:38 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 14:39:01 2012 -0800" }, "message": "proc: mem_release() should check mm !\u003d NULL\n\nmem_release() can hit mm \u003d\u003d NULL, add the necessary check.\n\nCc: stable@kernel.org\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fe9161db2e6053da21e4649d77bbefaf3030b11d", "tree": "3f875f40201455571280eef7a0c9fdc3c98e346e", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Wed Feb 01 22:16:36 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Feb 01 22:16:36 2012 +0100" }, "message": "PM / Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path\n\nIn the SNAPSHOT_CREATE_IMAGE ioctl, if the call to hibernation_snapshot()\nfails, the frozen tasks are not thawed.\n\nAnd in the case of success, if we happen to exit due to a successful freezer\ntest, all tasks (including those of userspace) are thawed, whereas actually\nwe should have thawed only the kernel threads at that point. Fix both these\nissues.\n\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "879a5a001b62a020e074d460b3a7c0fd993f9832", "tree": "90964394230dc219dcc4b396b367cd3a52a3998e", "parents": [ "7d731019218e49a9811f6d0adec4b1cfcb752bed" ], "author": { "name": "Greg KH", "email": "gregkh@linuxfoundation.org", "time": "Tue Jan 31 20:02:00 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 11:10:45 2012 -0800" }, "message": "MAINTAINERS: Greg\u0027s suse email address is dead\n\nMy email address has changed, the suse.de one is now dead, so update all\nof my MAINTAINER entries with the correct one so that patches don\u0027t get\nlost.\n\nAlso change the status of some of my entries as I\u0027m supposed to be doing\nthis stuff now for real.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7d731019218e49a9811f6d0adec4b1cfcb752bed", "tree": "a90bf478f8fe36543ba586db5fa2760ba129a180", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@linux.intel.com", "time": "Wed Feb 01 11:10:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 11:10:24 2012 -0800" }, "message": "mtd: fix merge conflict resolution breakage\n\nThis patch fixes merge conflict resolution breakage introduced by merge\nd3712b9dfcf4 (\"Merge tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream\").\n\nThe commit changed \u0027mtd_can_have_bb()\u0027 function and made it always\nreturn zero, which is incorrect. Instead, we need it to return whether\nthe underlying flash device can have bad eraseblocks or not. UBI needs\nthis information because it affects how it handles the underlying flash.\nE.g., if the underlying flash is NOR, it cannot have bad blocks and any\nwrite or erase error is fatal, and all we can do is to switch to R/O\nmode. We do not need to reserve a pool of good eraseblocks for bad\neraseblocks handling, and so on.\n\nThis patch also removes \u0027mtd_can_have_bb()\u0027 invocations from Logfs to\nensure correct Logfs behavior.\n\nI\u0027ve tested that with this patch UBI works on top of NOR and NAND\nflashes emulated by mtdram and nandsim correspondingly.\n\nThis patch is based on patch from Linus Torvalds.\n\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nAcked-by: Jörn Engel \u003cjoern@logfs.org\u003e\nAcked-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\nAcked-by: Brian Norris \u003ccomputersforpeace@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "7a0a27d2ce38aee19a31fee8c12095f586eed393" }