)]}' { "log": [ { "commit": "36a281e25276f2d138bbbca4170d11453323cce1", "tree": "ee27168ff87f8ec5d8d73ad36ac678ac39f22b80", "parents": [ "48c98b1bb85a09adf4aa27316682d573e1f37ebf" ], "author": { "name": "Jianchun Bian", "email": "jcbian@pixcir.com.cn", "time": "Fri Dec 30 15:16:21 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Dec 30 15:25:52 2011 -0800" }, "message": "Input: add driver for pixcir i2c touchscreens\n\nThis patch adds a driver for PIXCIR\u0027s I2C connected touchscreens.\n\nSigned-off-by: Jianchun \u003cjcbian@pixcir.com.cn\u003e\nAcked-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "5245db49d44e6033fece4d9f5946f8970c0d9ca1", "tree": "45eb7fad3b7a7078c1ac66193964dc88530ef7ee", "parents": [ "cd314fa6375b4de092a5b1de6aa194117523ecbb" ], "author": { "name": "Heiko Stübner", "email": "heiko@sntech.de", "time": "Tue Dec 27 21:21:17 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Dec 27 21:22:18 2011 -0800" }, "message": "Input: add driver for AUO In-Cell touchscreens using pixcir ICs\n\nSome displays from AUO have a so called in-cell touchscreen, meaning it\nis built directly into the display unit.\n\nTouchdata is gathered through PIXCIR Tango-ICs and processed in an\nAtmel ATmega168P with custom firmware. Communication between the host\nsystem and ATmega is done via I2C.\n\nDevices using this touch solution include the Dell Streak5 and the family\nof Qisda ebook readers.\n\nThe driver reports single- and multi-touch events including touch area\nvalues.\n\nSigned-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "ff803ed4ddbbf9f4bbd439b5e23dc25a4e0cce7a", "tree": "b5be9e01068ec08e491cb3f5579a46397e2dd389", "parents": [ "aeec05171d45700d9e97fec485afea0f19bc2635" ], "author": { "name": "Courtney Cavin", "email": "courtney.cavin@sonyericsson.com", "time": "Sun Dec 11 23:38:27 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Dec 12 00:03:36 2011 -0800" }, "message": "Input: add driver for Sharp gp2ap002a00f proximity sensor\n\nThis driver adds support for Sharp\u0027s GP2AP002A00F proximity sensor. The\nproximity is measured as a binary switch, i.e. an object is either\ndetected or not detected. Hence, this driver is implemented as a switch\nthat reports SW_FRONT_PROXIMITY.\n\nReviewed-by: Datta Shubhrajyoti \u003cshubhrajyoti@ti.com\u003e\nSigned-off-by: Courtney Cavin \u003ccourtney.cavin@sonyericsson.com\u003e\nSigned-off-by: Oskar Andero \u003coskar.andero@sonyericsson.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "3bfd5c5baf66e975b0f365a0cda8d75bf2953ebe", "tree": "49517da40dd6071ed9d3acde9fa1ef97d39ede13", "parents": [ "a6c61789c8499381a5fe612f11dc95d0b55e590a" ], "author": { "name": "Heiko Stübner", "email": "heiko@sntech.de", "time": "Tue Nov 29 11:04:09 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Nov 30 23:41:16 2011 -0800" }, "message": "Input: add generic GPIO-tilt driver\n\nThere exist tilt switches that simply report their tilt-state via\nsome gpios. The number and orientation of their axes can vary\ndepending on the switch used and the build of the device. Also two\nor more one-axis switches could be combined to provide multi-dimensional\norientation.\n\nOne example of a device using such a switch is the family of Qisda\nebook readers, where the switch provides information about the\nlandscape / portrait orientation of the device. The example in\nDocumentation/input/gpio-tilt.txt documents exactly this one-axis\ndevice.\n\nSigned-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4", "tree": "d2ca69347816c27f9dc352581f5d0fe76811cd49", "parents": [ "3d95fd6ad8d3cf582a70ed65660017114b6e4065", "caca6a03d365883564885f2c1da3e88dcf65d139" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Nov 29 01:51:07 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Nov 29 01:51:07 2011 -0800" }, "message": "Merge commit \u0027v3.2-rc3\u0027 into next\n" }, { "commit": "9b82e65d65c90faecc408bcdc14a0229736ed193", "tree": "2cf5fd4f4df01c6488afd0046325405381a73e36", "parents": [ "8174a06eba10a43375d1dd6f74c58a71519e3be5", "e6af578c5305be693a1bc7f4dc7b51dd82d41425" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 20:19:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 20:19:31 2011 -0800" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-pci: make reset operation safer\n virtio-mmio: Correct the name of the guest features selector\n virtio: add HAS_IOMEM dependency to MMIO platform bus driver\n" }, { "commit": "e6af578c5305be693a1bc7f4dc7b51dd82d41425", "tree": "7276a130a2d2eddf84660ec2573298e26611a442", "parents": [ "fe1a7fe2c4456679b3402f04268bdfafca7b127a" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 17 17:41:15 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Nov 24 13:04:48 2011 +1030" }, "message": "virtio-pci: make reset operation safer\n\nvirtio pci device reset actually just does an I/O\nwrite, which in PCI is really posted, that is it\ncan complete on CPU before the device has received it.\n\nFurther, interrupts might have been pending on\nanother CPU, so device callback might get invoked after reset.\n\nThis conflicts with how drivers use reset, which is typically:\n\treset\n\tunregister\na callback running after reset completed can race with\nunregister, potentially leading to use after free bugs.\n\nFix by flushing out the write, and flushing pending interrupts.\n\nThis assumes that device is never reset from\nits vq/config callbacks, or in parallel with being\nadded/removed, document this assumption.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "fe1a7fe2c4456679b3402f04268bdfafca7b127a", "tree": "e792020a75a1cd7b2b8d4d41aae7c223d1ade046", "parents": [ "bd20817f733ceb0291e0449106307ffc939006ba" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Tue Nov 15 16:17:18 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Nov 24 13:04:47 2011 +1030" }, "message": "virtio-mmio: Correct the name of the guest features selector\n\nGuest features selector spelling mistake.\n\nCc: Pawel Moll \u003cpawel.moll@arm.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: virtualization@lists.linux-foundation.org\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "09521577ca7718b6c83f095ca4f0d474b01a8378", "tree": "56bbc5f0ac255f36a0935d3ba4e0a4702203dc66", "parents": [ "de7badf1adc7cc95269ac4b435da23c169018a3e", "4cac2eb158c6da0c761689345c6cc5df788a6292" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 14:58:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 14:58:46 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:\n PCI hotplug: shpchp: don\u0027t blindly claim non-AMD 0x7450 device IDs\n PCI: pciehp: wait 100 ms after Link Training check\n PCI: pciehp: wait 1000 ms before Link Training check\n PCI: pciehp: Retrieve link speed after link is trained\n PCI: Let PCI_PRI depend on PCI\n PCI: Fix compile errors with PCI_ATS and !PCI_IOV\n PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug\n" }, { "commit": "5907c5f8adbd0bb7ab69124520304e5b25c8eb5e", "tree": "c3e1bc99f41c74b369293c74a1752e57e538f706", "parents": [ "0a2c986557b964453f8deeaf56f6d88bf3e65e92", "eff245c82f115059648cdce95dd68bb940f2b006" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:50:05 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:50:05 2011 -0800" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: Make i2cdev_notifier_call static\n i2c: Delete ANY_I2C_BUS\n i2c: Fix device name for 10-bit slave address\n i2c-algo-bit: Generate correct i2c address sequence for 10-bit target\n" }, { "commit": "0a2c986557b964453f8deeaf56f6d88bf3e65e92", "tree": "7b27e1afff3e5380826d62b2f5bb50533ade4fec", "parents": [ "2d0f2400a49be3a177695eda381d91fec18cbd0e", "780dc9ba4eb682a89be48d5b814feae6722a19e0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:49:39 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:49:39 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: TPS65910: Fix VDD1/2 voltage selector count\n" }, { "commit": "780dc9ba4eb682a89be48d5b814feae6722a19e0", "tree": "5ddac04630d0bcaf0405c4f5f08793ca68c3439c", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "Afzal Mohammed", "email": "afzal@ti.com", "time": "Tue Nov 08 18:54:10 2011 +0530" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 23 14:03:52 2011 +0000" }, "message": "regulator: TPS65910: Fix VDD1/2 voltage selector count\n\nCount of selector voltage is required for regulator_set_voltage\nto work via set_voltage_sel. VDD1/2 currently have it as zero,\nso regulator_set_voltage won\u0027t work for VDD1/2.\nUpdate count (n_voltages) for VDD1/2.\n\nOutput Voltage \u003d (step value * 12.5 mV + 562.5 mV) * gain\n\nWith above expr, number of voltages that can be selected is\nstep value count * gain count\n\nconstant for gain count will be called VDD1_2_NUM_VOLT_COARSE\n\nexisting constant for step value count is VDD1_2_NUM_VOLTS,\nuse VDD1_2_NUM_VOLT_FINE instead to make clear that step value\nis not the only component in deciding selectable voltage count\n\nSigned-off-by: Afzal Mohammed \u003cafzal@ti.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "67820021dc9c8da37f773025190280f55f3626d4", "tree": "44957ea27a84752357b502b6b36abe64d39c6a39", "parents": [ "cbb44514048a250647c6c6b3df27ff62cb71f7d5" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Nov 23 11:33:07 2011 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Nov 23 11:33:07 2011 +0100" }, "message": "i2c: Delete ANY_I2C_BUS\n\nLast piece of code using ANY_I2C_BUS was deleted almost 2 years ago,\nso ANY_I2C_BUS can go away as well.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd", "tree": "3f5d705161f24c6a9dc36c1947ce7f81e53db41b", "parents": [ "af36d15f58a3560617f1497ae011c3192049e40e", "62e4a76987eab2b7fa952546614bc83e5bfc9d3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:54:15 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:54:15 2011 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFS: Revert pnfs ugliness from the generic NFS read code path\n SUNRPC: destroy freshly allocated transport in case of sockaddr init error\n NFS: Fix a regression in the referral code\n nfs: move nfs_file_operations declaration to bottom of file.c (try #2)\n nfs: when attempting to open a directory, fall back on normal lookup (try #5)\n" }, { "commit": "8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57", "tree": "d4d1c687f1b7f58783103b43a04618d8e4019bba", "parents": [ "bbbc4791cd48ac12996e43c0033b504c79b53639", "468e6a20afaccb67e2a7d7f60d301f90e1c6f301" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:22:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:22:48 2011 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: remove vm_dirties and task-\u003edirties\n writeback: hard throttle 1000+ dd on a slow USB stick\n mm: Make task in balance_dirty_pages() killable\n" }, { "commit": "3b9abc7e48561b0b140ee267e190bc1031f82ff3", "tree": "ec5d8174f89cb8555c74eb3eb770054aa22fc724", "parents": [ "0cda56962b883cd5e7aa036350e5a0283a88c590", "0c73c08ec73dbe080b9ec56696ee21d32754d918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:46 2011 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n TTY: ldisc, wait for ldisc infinitely in hangup\n TTY: ldisc, move wait idle to caller\n TTY: ldisc, allow waiting for ldisc arbitrarily long\n Revert \"tty/serial: Prevent drop of DCD on suspend for Tegra UARTs\"\n RS485: fix inconsistencies in the meaning of some variables\n pch_uart: Fix DMA resource leak issue\n serial,mfd: Fix CMSPAR setup\n tty/serial: Prevent drop of DCD on suspend for Tegra UARTs\n pch_uart: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor\n pch_uart: Support new device LAPIS Semiconductor ML7831 IOH\n pch_uart: Fix hw-flow control issue\n tty: hvc_dcc: Fix duplicate character inputs\n jsm: Change maintainership\n" }, { "commit": "0cda56962b883cd5e7aa036350e5a0283a88c590", "tree": "acb54a8550f3d768a45ad297761f8f6cba90d19e", "parents": [ "b0d81664a0092d8f6df7742b5aee6fcfd326b36c", "91a13c281d7d4648c0b32dede11a0144c4e7984c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:26 2011 -0800" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n drivers/base/node.c: fix compilation error with older versions of gcc\n uio: documentation fixups\n device.h: Fix struct member documentation\n" }, { "commit": "c292fe4aae5aa5c089633bc40342d27c8275306a", "tree": "84c6898327eb35c3c20c1728eaff8ca19094ddeb", "parents": [ "7758c4d6e9371efa04a1cf1b124bbf9cc43e830e", "224736d9113ab4a7cf3f05c05377492bd99b4b02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 12:11:13 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 12:11:13 2011 -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 libceph: Allocate larger oid buffer in request msgs\n ceph: initialize root dentry\n ceph: fix iput race when queueing inode work\n" }, { "commit": "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82", "tree": "54dd0130534a0e20195f45ece12421c604064d01", "parents": [ "a4cc3889f7e2c3f2fd15b492822c889fed5e1800", "9cc20b268a5a14f5e57b8ad405a83513ab0d78dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:59:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:59:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)\n ipv4: fix redirect handling\n ping: dont increment ICMP_MIB_INERRORS\n sky2: fix hang in napi_disable\n sky2: enforce minimum ring size\n bonding: Don\u0027t allow mode change via sysfs with slaves present\n f_phonet: fix page offset of first received fragment\n stmmac: fix pm functions avoiding sleep on spinlock\n stmmac: remove spin_lock in stmmac_ioctl.\n stmmac: parameters auto-tuning through HW cap reg\n stmmac: fix advertising 1000Base capabilties for non GMII iface\n stmmac: use mdelay on timeout of sw reset\n sky2: version 1.30\n sky2: used fixed RSS key\n sky2: reduce default Tx ring size\n sky2: rename up/down functions\n sky2: pci posting issues\n sky2: fix hang on shutdown (and other irq issues)\n r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list\n MAINTAINERS: change email address for shemminger\n pch_gbe: Move #include of module.h\n ...\n" }, { "commit": "a4cc3889f7e2c3f2fd15b492822c889fed5e1800", "tree": "d455a7392bc48aa44f61346e09b9cab63522d5b9", "parents": [ "bb893d15b564f7711b60e0bc12966d049980582d", "95ef1e52922cf75b1ea2eae54ef886f2cc47eecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:57:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:57:43 2011 -0800" }, "message": "Merge branch \u0027kvm-updates/3.2\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.2\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM guest: prevent tracing recursion with kvmclock\n Revert \"KVM: PPC: Add support for explicit HIOR setting\"\n KVM: VMX: Check for automatic switch msr table overflow\n KVM: VMX: Add support for guest/host-only profiling\n KVM: VMX: add support for switching of PERF_GLOBAL_CTRL\n KVM: s390: announce SYNC_MMU\n KVM: s390: Fix tprot locking\n KVM: s390: handle SIGP sense running intercepts\n KVM: s390: Fix RUNNING flag misinterpretation\n" }, { "commit": "2d360fcbd851b7f9f8c23b1c30b2f3c060fa43e6", "tree": "8228db95030b82921c90b95f353441946af3a677", "parents": [ "a767835f6dc85277e40fbfe69a29c18817d6c00b", "501a708f18ef911328ffd39f39738b8a7862aa8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:33:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:33:02 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Suspend: Fix bug in suspend statistics update\n PM / Hibernate: Fix the early termination of test modes\n PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset\n PM Sleep: Do not extend wakeup paths to devices with ignore_children set\n PM / driver core: disable device\u0027s runtime PM during shutdown\n PM / devfreq: correct Kconfig dependency\n PM / devfreq: fix use after free in devfreq_remove_device\n PM / shmobile: Avoid restoring the INTCS state during initialization\n PM / devfreq: Remove compiler error after irq.h update\n PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()\n PM / Clocks: Only disable enabled clocks in pm_clk_suspend()\n ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix\n PM / shmobile: Don\u0027t skip debugging output in pd_power_up()\n" }, { "commit": "a5c86e986f0b2fe779f13cf53ce6e9f467b03950", "tree": "754679947f1e0b014d90ea526eef4f89b9f2afef", "parents": [ "208f6f6068836e10d526e87fef6ca4364f4ec068" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Sat Nov 19 02:33:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 19 06:15:59 2011 -0500" }, "message": "hugetlb: remove dummy definitions of HPAGE_MASK and HPAGE_SIZE\n\nDummy, non-zero definitions for HPAGE_MASK and HPAGE_SIZE were added in\n51c6f666fceb (\"mm: ZAP_BLOCK causes redundant work\") to avoid a divide\nby zero in generic kernel code.\n\nThat code has since been removed, but probably should never have been\nadded in the first place: we don\u0027t want HPAGE_SIZE to act like PAGE_SIZE\nfor code that is working with hugepages, for example, when the\ndependency on CONFIG_HUGETLB_PAGE has not been fulfilled.\n\nBecause hugepage size can differ from architecture to architecture, each\nis required to have their own definitions for both HPAGE_MASK and\nHPAGE_SIZE. This is always done in arch/*/include/asm/page.h.\n\nSo, just remove the dummy and dangerous definitions since they are no\nlonger needed and reveals the correct dependencies. Tested on\narchitectures using the definitions with allyesconfig: x86 (even with\nthp), hppa, mips, powerpc, s390, sh3, sh4, sparc, and sparc64, and with\ndefconfig on ia64.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "208f6f6068836e10d526e87fef6ca4364f4ec068", "tree": "b9558820a176572b529ca6c1473b7c5ddb4b08ec", "parents": [ "ab5c5f639bba89d1103deae447836edf41e37659", "ea441d1104cf1efb471fa81bc91e9fd1e6ae29fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 19 06:06:39 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 19 06:06:39 2011 -0500" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n new helper: mount_subtree()\n switch create_mnt_ns() to saner calling conventions, fix double mntput() in nfs\n btrfs: fix double mntput() in mount_subvol()\n" }, { "commit": "b6844523839779030430ff28f036f83e2a3f43e6", "tree": "0af97f08911fab7e1351646172b1805c287ea300", "parents": [ "15bd1cfb3055d866614cdaf38e43201936264e50", "99cb2ddcc617f43917e94a4147aa3ccdb2bcd77e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 13:18:07 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 13:18:07 2011 -0200" }, "message": "Merge branch \u0027stable/for-linus-fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-fixes-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen-gntalloc: signedness bug in add_grefs()\n xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()\n xen-gntdev: integer overflow in gntdev_alloc_map()\n xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.\n xen/balloon: Avoid OOM when requesting highmem\n xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI\n xen: map foreign pages for shared rings by updating the PTEs directly\n" }, { "commit": "15bd1cfb3055d866614cdaf38e43201936264e50", "tree": "020261b5a984684201a39e661934aa5dcdf82f83", "parents": [ "9545eb61e5bb70055fd9358f25f95387f7398cba", "019ceb7d5d252ce71001a157cf29f4ac28501b72" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 09:34:35 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 09:34:35 2011 -0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: add missed trace_block_plug\n paride: fix potential information leak in pg_read()\n bio: change some signed vars to unsigned\n block: avoid unnecessary plug list flush\n cciss: auto engage SCSI mid layer at driver load time\n loop: cleanup set_status interface\n include/linux/bio.h: use a static inline function for bio_integrity_clone()\n loop: prevent information leak after failed read\n block: Always check length of all iov entries in blk_rq_map_user_iov()\n The Windows driver .inf disables ASPM on all cciss devices. Do the same.\n backing-dev: ensure wakeup_timer is deleted\n block: Revert \"[SCSI] genhd: add a new attribute \"alias\" in gendisk\"\n" }, { "commit": "8b258cc8ac229aa7d5dcb7cc34cb35d9124498ac", "tree": "9615636b05b04035af0c8eb11ee9711aa2b868a6", "parents": [ "af8db1508f2c9f3b6e633e2d2d906c6557c617f9" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Nov 17 21:39:33 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Nov 17 21:39:33 2011 +0100" }, "message": "PM Sleep: Do not extend wakeup paths to devices with ignore_children set\n\nCommit 4ca46ff3e0d8c234cb40ebb6457653b59584426c (PM / Sleep: Mark\ndevices involved in wakeup signaling during suspend) introduced\nthe power.wakeup_path field in struct dev_pm_info to mark devices\nwhose children are enabled to wake up the system from sleep states,\nso that power domains containing the parents that provide their\nchildren with wakeup power and/or relay their wakeup signals are not\nturned off. Unfortunately, that introduced a PM regression on SH7372\nwhose power consumption in the system \"memory sleep\" state increased\nas a result of it, because it prevented the power domain containing\nthe I2C controller from being turned off when some children of that\ncontroller were enabled to wake up the system, although the\ncontroller was not necessary for them to signal wakeup.\n\nTo fix this issue use the observation that devices whose\npower.ignore_children flag is set for runtime PM should be treated\nanalogously during system suspend. Namely, they shouldn\u0027t be\nincluded in wakeup paths going through their children. Since the\nSH7372 I2C controller\u0027s power.ignore_children flag is set, doing so\nwill restore the previous behavior of that SOC.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "bb75c627fb0dfb8c0ab75d3033709ff928896e16", "tree": "a012b220304a44a949b2be98ac2b07e50e52fe01", "parents": [ "e7fc6f93b4242b2b566f0070709e27257d6da8a2" ], "author": { "name": "Alexander Graf", "email": "agraf@suse.de", "time": "Thu Nov 17 15:26:35 2011 +0100" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Nov 17 16:30:25 2011 +0200" }, "message": "Revert \"KVM: PPC: Add support for explicit HIOR setting\"\n\nThis reverts commit a15bd354f083f20f257db450488db52ac27df439.\n\nIt exceeded the padding on the SREGS struct, rendering the ABI\nbackwards-incompatible.\n\nConflicts:\n\n\tarch/powerpc/kvm/powerpc.c\n\tinclude/linux/kvm.h\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "468e6a20afaccb67e2a7d7f60d301f90e1c6f301", "tree": "5558e92e85decd0fa0bb95ed6e637e1f68ea2fe1", "parents": [ "1df647197c5b8aacaeb58592cba9a1df322c9000" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Wed Sep 07 10:41:32 2011 -0600" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Thu Nov 17 20:49:06 2011 +0800" }, "message": "writeback: remove vm_dirties and task-\u003edirties\n\nThey are not used any more.\n\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "ea441d1104cf1efb471fa81bc91e9fd1e6ae29fd", "tree": "32b7c4f7c78af47936a604e3f4e13e8e61f834a0", "parents": [ "c13344958780b4046305ee6235d686c846535529" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 16 21:43:59 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 16 22:00:34 2011 -0500" }, "message": "new helper: mount_subtree()\n\ntakes vfsmount and relative path, does lookup within that vfsmount\n(possibly triggering automounts) and returns the result as root\nof subtree suitable for return by -\u003emount() (i.e. a reference to\ndentry and an active reference to its superblock grabbed, superblock\nlocked exclusive).\n\nbtrfs and nfs switched to it instead of open-coding the sucker.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "cd12909cb576d37311fe35868780e82d5007d0c8", "tree": "70ec60af4feb32087f542a838fe4dce8717f0cd6", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "David Vrabel", "email": "david.vrabel@citrix.com", "time": "Thu Sep 29 16:53:32 2011 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Nov 16 12:13:08 2011 -0500" }, "message": "xen: map foreign pages for shared rings by updating the PTEs directly\n\nWhen mapping a foreign page with xenbus_map_ring_valloc() with the\nGNTTABOP_map_grant_ref hypercall, set the GNTMAP_contains_pte flag and\npass a pointer to the PTE (in init_mm).\n\nAfter the page is mapped, the usual fault mechanism can be used to\nupdate additional MMs. This allows the vmalloc_sync_all() to be\nremoved from alloc_vm_area().\n\nSigned-off-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n[v1: Squashed fix by Michal for no-mmu case]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "121f099412bd6576dfb3d94222e89d9341362177", "tree": "47b82e98cb879d4cf08f0465ade31d58833cf53c", "parents": [ "3540d5e89b2ac268fcfc9b07a50a9ba4acc2e5e5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Nov 16 09:21:50 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Nov 16 09:21:50 2011 +0100" }, "message": "bio: change some signed vars to unsigned\n\nThis is just a cleanup patch to silence a static checker warning.\n\nThe problem is that we cap \"nr_iovecs\" so it can\u0027t be larger than\n\"UIO_MAXIOV\" but we don\u0027t check for negative values. It turns out this is\nprevented at other layers, but logically it doesn\u0027t make sense to have\nnegative nr_iovecs so making it unsigned is nicer.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0c614e2d3e6ee6ff13c6181f380787cea1d82d1d", "tree": "a616d7b48965c661fd5731d625a74bddde78f623", "parents": [ "3bb9068278ea524581237abadd41377a14717e7d" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed Nov 16 09:21:48 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Nov 16 09:21:48 2011 +0100" }, "message": "include/linux/bio.h: use a static inline function for bio_integrity_clone()\n\nWhen CONFIG_BLK_DEV_INTEGRITY is not set, we get these warnings:\n\ndrivers/md/dm.c: In function \u0027split_bvec\u0027:\ndrivers/md/dm.c:1061:3: warning: statement with no effect\ndrivers/md/dm.c: In function \u0027clone_bio\u0027:\ndrivers/md/dm.c:1088:3: warning: statement with no effect\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "93f3350c46fa5dfcc9650eb19b186e71ffc924c3", "tree": "13b6f81f9fd85227283b38af6267d094e0038beb", "parents": [ "90f04c2926cfb5bf74533b0a7766bc896f6a0c0e" ], "author": { "name": "Claudio Scordino", "email": "claudio@evidence.eu.com", "time": "Wed Nov 09 15:51:49 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 15 12:13:44 2011 -0800" }, "message": "RS485: fix inconsistencies in the meaning of some variables\n\nThe crisv10.c and the atmel_serial.c serial drivers intepret the fields of the\nserial_rs485 structure in a different way.\n\nIn particular, crisv10.c uses SER_RS485_RTS_AFTER_SEND and\nSER_RS485_RTS_ON_SEND for the voltage of the RTS pin; atmel_serial.c,\ninstead, uses these values to know if a delay must be set before and\nafter sending. This patch makes the usage of these variables consistent\nacross all drivers and fixes the Documentation as well.\n\nFrom now on, SER_RS485_RTS_AFTER_SEND and SER_RS485_RTS_ON_SEND will be\nused to set the voltage of the RTS pin (as in the crisv10.c driver); the\ndelay will be understood by looking only at the value of\ndelay_rts_before_send and delay_rts_after_send.\n\nSigned-off-by: Claudio Scordino \u003cclaudio@evidence.eu.com\u003e\nSigned-off-by: Darron Black \u003cdarron@griffin.net\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7b08fae8fbf0c14f003be8e039ed37bcbae4415a", "tree": "22c86f2338b96f85584916a844dcabc921ec73c1", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Marcos Paulo de Souza", "email": "marcos.mage@gmail.com", "time": "Tue Nov 01 11:15:40 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 15 11:14:01 2011 -0800" }, "message": "device.h: Fix struct member documentation\n\nFix warning of make xmldocs of documention of the struct member iommu_ops from struct bus_type.\n\nSigned-off-by: Marcos Paulo de Souza \u003cmarcos.mage@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "8d964a2872ea0914e00bc7798e68899e01715185", "tree": "e55e7ed48bdf53637cb53d18d436bf0e4cecdab0", "parents": [ "400bf2995be617474ebc4b2a0989f2b0a0e498cf" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Nov 07 23:59:41 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Nov 15 09:46:14 2011 -0800" }, "message": "Input: samsung-keypad - enable compiling on other platforms\n\nThere is nothing in keypad platform definitions that requires\nthe driver be complied on Samsung platform only, so let\u0027s move them\nout of the platform subdirectory and relax the dependencies.\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "5870b2c719b15cfe3f2de3e8be51bc6e17c67e7a", "tree": "4e07c0d5a2aeca013c38c4845229c726a14b4050", "parents": [ "642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03", "45f034ef205e5439a50d6f7e5f89add93131c0cc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 15 14:48:51 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 15 14:48:51 2011 -0200" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/triad/linux-pinctrl\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/triad/linux-pinctrl:\n pinctrl: hide subsystem from the populace\n pinctrl: fix \"warning: \u0027struct pinctrl_dev\u0027 declared inside parameter list\"\n" }, { "commit": "7f80850d3f9fd8fda23a317044aef3a6bafab06b", "tree": "4b98a9aa01f1479ab5abfbafcb1a3d9b6e332d34", "parents": [ "b93cd6a0c7352b428ba2b8437b44fff6e76d81d2", "b73b5c493ac001870bd9faf565a61908c82f52d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:47:04 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:47:04 2011 -0200" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\n* \u0027rmobile-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh:\n ARM: mach-shmobile: cpuidle single/global and last_state fixes\n ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h\n ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h\n ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h\n ARM: mach-shmobile: ap4evb: remove white space from end of line\n ARM: mach-shmobile: clock-sh7372: remove un-necessary index\n ARM: mach-shmobile: kota2: add comment out separator\n ARM: mach-shmobile: sh73a0: add MMC data pin pull-up\n" }, { "commit": "b93cd6a0c7352b428ba2b8437b44fff6e76d81d2", "tree": "9521480c841f978f8299374a649d4c2ef0b2b22b", "parents": [ "d291ffb3cf4f8f74b73bac77478c619251ee8a9f", "ab4f75cd0a9f5ffdcc3d9fc2b29ca14525215b78" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:45:30 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:45:30 2011 -0200" }, "message": "Merge branch \u0027sh-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\n* \u0027sh-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh:\n mailmap: Fix up some renesas attributions\n sh: clkfwk: Kill off remaining debugfs cruft.\n drivers: sh: Kill off dead pathname for runtime PM stub.\n drivers: sh: Generalize runtime PM platform stub.\n sh: Wire up process_vm syscalls.\n sh: clkfwk: add clk_rate_mult_range_round()\n serial: sh-sci: Fix up SH-2A SCIF support.\n sh: Fix cached/uncaced address calculation in 29bit mode\n" }, { "commit": "06236ac3726f15124839cf16a9e2730a852dad9b", "tree": "244d55c591844e58cc357af3b42e6360825f05e1", "parents": [ "6d74eb9442fb113c97edc88a1c658462db711337" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Nov 07 14:23:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 01:08:49 2011 -0500" }, "message": "net-netlink: Add a new attribute to expose TCLASS values via netlink\n\ncommit 3ceca749668a52bd795585e0f71c6f0b04814f7b added a TOS attribute.\n\nUnfortunately TOS and TCLASS are both present in a dual-stack v6 socket,\nfurthermore they can have different values. As such one cannot in a\nsane way expose both through a single attribute.\n\nSigned-off-by: Maciej Żenczyowski \u003cmaze@google.com\u003e\nCC: Murali Raja \u003cmuralira@google.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87618e0003dbca0f51f1ef52fa4199bd65212f41", "tree": "d814cfe3675352bea6133518b7d93d7052048ece", "parents": [ "c1f4246716392ec8693c23cffb969bd73c1b0910", "2d5fcc986da944bca8257f358b155eec79fc4120" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:55:01 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:55:01 2011 -0200" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://github.com/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://github.com/jgarzik/libata-dev:\n pata_of_platform: Don\u0027t use NO_IRQ\n [libata] ahci: Add ASMedia ASM1061 support\n [libata] Issue SRST to Sil3726 PMP\n sata_sis.c: trivial spelling fix\n ahci_platform: use dev_get_platdata()\n [libata] libata-scsi.c: Add function parameter documentation\n" }, { "commit": "fe10e6f4b24ef8ca12cb4d2368deb4861ab1861b", "tree": "86f524927ce64b07b3ab18254558e7fa766b0688", "parents": [ "f28ad3b44a03892b533cfb503273370033594d9d", "d938e66003c9ccc6c0ab10fa31ee23cf27574d66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:45:42 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:45:42 2011 -0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: usb-audio: Use kmemdup rather than duplicating its implementation\n ALSA: hda - Re-enable the check NO_PRESENCE misc bit\n ALSA: vmaster - Free slave-links when freeing the master element\n ALSA: hda - Don\u0027t add elements of other codecs to vmaster slave\n ALSA: intel8x0: improve virtual environment detection\n ALSA: intel8x0: move virtual environment detection code into one place\n ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384\n ALSA: hda - fix internal mic on Dell Vostro 3500 laptop\n ALSA: HDA: Remove quirk for Toshiba T110\n ALSA: usb-audio - Fix the missing volume quirks at delayed init\n ALSA: hda - Mute unused capture sources for Realtek codecs\n ALSA: intel8x0: Improve comments for VM optimization\n ASoC: Ensure we get an impedence reported for WM8958 jack detect\n ASoC: Don\u0027t use wm8994-\u003econtrol_data when requesting IRQs\n ASoC: Don\u0027t use wm8994-\u003econtrol_data in wm8994_readable_register()\n ASoC: Update git repository URL\n" }, { "commit": "224736d9113ab4a7cf3f05c05377492bd99b4b02", "tree": "0a8fe8063e904eebc2f591607faf8711b78016f8", "parents": [ "774ac21da76f5c3018428725074e27a3fd40b128" ], "author": { "name": "Stratos Psomadakis", "email": "psomas@grnet.gr", "time": "Thu Nov 10 15:45:37 2011 +0200" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Nov 11 09:50:19 2011 -0800" }, "message": "libceph: Allocate larger oid buffer in request msgs\n\nceph_osd_request struct allocates a 40-byte buffer for object names.\nRBD image names can be up to 96 chars long (100 with the .rbd suffix),\nwhich results in the object name for the image being truncated, and a\nsubsequent map failure.\n\nIncrease the oid buffer in request messages, in order to avoid the\ntruncation.\n\nSigned-off-by: Stratos Psomadakis \u003cpsomas@grnet.gr\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "9b49139b34a66907662e0be8efe79316dc63f8e0", "tree": "545a6b85d86536e9be40cf80857f9c55de50eef5", "parents": [ "972c3fb69cd1cd8d549b8a06ce42611eab405c20" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:43 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:35 2011 +0900" }, "message": "ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "972c3fb69cd1cd8d549b8a06ce42611eab405c20", "tree": "958d994516ba847b88f747524a127190d2b9784d", "parents": [ "bd8d0cbaa00883c84741b98264f8318cdade9c71" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:33 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:33 2011 +0900" }, "message": "ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h\n\nThis patch moves PORT_xx helper macro to sh_pfc.h,\nand it expects CPU_ALL_PORT() macro for each CPU\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "bd8d0cbaa00883c84741b98264f8318cdade9c71", "tree": "4b603206fa6329779b3b56afe28ecac252f891d9", "parents": [ "8e6a46757ad11a16354b9037e17d6135d9a4bb87" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:23 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:30 2011 +0900" }, "message": "ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h\n\nThis patch move PORT_DATA_xx helper macro to sh_pfc.h.\nand pfc-sh7372.c used it\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "37bef8f989ed85cdc6cf6fb9c1b1c096179b0708", "tree": "bf90e7eaa25d3fb36a8cb2f88e75f49727e8c04a", "parents": [ "149c370f3e06a6b43bf1d922ccd1f969c59c7c77", "d03299ee6020b0cc64fc4180162fb2e8795394e1", "79e7066415a8b12adbeacc41b3dc44423534b8be" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:16:25 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:16:25 2011 +0900" }, "message": "Merge branches \u0027sh/pm-runtime\u0027 and \u0027common/clkfwk\u0027 into sh-fixes-for-linus\n" }, { "commit": "79e7066415a8b12adbeacc41b3dc44423534b8be", "tree": "e7ad1167d962ce9abfcd049050bf0e1bd8e46a1d", "parents": [ "dd2c0ca1b153b555c09fd8e08f6842e12cf8e87b" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:11:41 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:11:41 2011 +0900" }, "message": "sh: clkfwk: Kill off remaining debugfs cruft.\n\nNow that all of the named string association with clocks has been\nmigrated to clkdev lookups there\u0027s no meaningful named topology that can\nbe constructed for a debugfs tree view. Get rid of the left over bits,\nand shrink struct clk a bit in the process.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "d0985394e7fee6b25a7cc8335d45bc1c1a8ab2d3", "tree": "44f19c0500580fd0c3ea39f355c9636bec59d677", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Nov 10 09:03:55 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Nov 10 09:03:55 2011 +0100" }, "message": "block: Revert \"[SCSI] genhd: add a new attribute \"alias\" in gendisk\"\n\nThis reverts commit a72c5e5eb738033938ab30d6a634b74d1d060f10.\n\nThe commit introduced alias for block devices which is intended to be\nused during logging although actual usage hasn\u0027t been committed yet.\nThis approach adds very limited benefit (raw log might be easier to\nfollow) which can be trivially implemented in userland but has a lot\nof problems.\n\nIt is much worse than netif renames because it doesn\u0027t rename the\nactual device but just adds conveninence name which isn\u0027t used\nuniversally or enforced. Everything internal including device lookup\nand sysfs still uses the internal name and nothing prevents two\ndevices from using conflicting alias - ie. sda can have sdb as its\nalias.\n\nThis has been nacked by people working on device driver core, block\nlayer and kernel-userland interface and shouldn\u0027t have been\nupstreamed. Revert it.\n\n http://thread.gmane.org/gmane.linux.kernel/1155104\n http://thread.gmane.org/gmane.linux.scsi/68632\n http://thread.gmane.org/gmane.linux.scsi/69776\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n Acked-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: \"James E.J. Bottomley\" \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: Nao Nishijima \u003cnao.nishijima.xt@hitachi.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "e0e20753c15fc418d94fee826af394907df856d8", "tree": "e503026776ba7e593f15f39c3c03999f1136d9bc", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Barry Song", "email": "Baohua.Song@csr.com", "time": "Thu Oct 27 20:38:24 2011 -0700" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Nov 09 15:07:40 2011 +0100" }, "message": "pinctrl: fix \"warning: \u0027struct pinctrl_dev\u0027 declared inside parameter list\"\n\nwhen pinctl subsystem is not selected, when compiling drivers including\nthe include/linux/pinctrl/pinctrl.h, we will get the warning as below:\nIn file included from include/linux/pinctrl/pinmux.h:17,\n from drivers/tty/serial/sirfsoc_uart.c:25:\ninclude/linux/pinctrl/pinctrl.h:126: warning: \u0027struct pinctrl_dev\u0027\n\t\tdeclared inside parameter list\ninclude/linux/pinctrl/pinctrl.h:126: warning: its scope is only this\n definition or declaration, which is probably not what you want\n\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "c9703765f3d5ab27909011dee4a05affe48e4442", "tree": "ac105477c2de855106f90a074b628ad8008c4cfe", "parents": [ "7a46c0780babea7d0b3f277a33ea243be38eb942" ], "author": { "name": "Keng-Yu Lin", "email": "kengyu@canonical.com", "time": "Wed Nov 09 01:47:36 2011 -0500" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Wed Nov 09 01:47:36 2011 -0500" }, "message": "[libata] ahci: Add ASMedia ASM1061 support\n\nSigned-off-by: Keng-Yu Lin \u003ckengyu@canonical.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "3b7546211d53f600e15ca7867adbf3c085b8ecc9", "tree": "9bd7f0eb414bad882d3e7f59e742ac1a21e804c5", "parents": [ "c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1", "156acb166ea9a43d7fcdf9b8051694ce4e91dbfc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 14:24:18 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 14:24:18 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())\n PM / devfreq: fix private_data\n Documentation: Fix typo in freezer-subsystem.txt\n PM / QoS: Set cpu_dma_pm_qos-\u003ename\n" }, { "commit": "1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad", "tree": "3f5d8f9f6e5edd991dbc6b51685dd726543e755a", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5", "19940b3d55c87d8089a8cb0fa8e5a9918a3846bd" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Nov 08 10:37:41 2011 +0000" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Nov 08 10:37:41 2011 +0000" }, "message": "Merge branch \u0027for-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.2\n" }, { "commit": "816af3bb5022c1468b3d826c645ddc2cac45bc97", "tree": "1b2a6abc75c00366f71c820ae946f4bdce4d90d9", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Thu Nov 03 14:45:48 2011 +0800" }, "committer": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Nov 08 09:28:27 2011 +0200" }, "message": "hwspinlock: Don\u0027t return a value in __hwspin_unlock\n\nFix below build warning:\n\n CC arch/arm/mach-omap2/hwspinlock.o\nIn file included from arch/arm/mach-omap2/hwspinlock.c:22:\ninclude/linux/hwspinlock.h: In function \u0027__hwspin_unlock\u0027:\ninclude/linux/hwspinlock.h:121: warning: \u0027return\u0027 with a value, in function returning void\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\n" }, { "commit": "1a51cfdc4516a6e1f2c1f8a579630a027c30331a", "tree": "e5bd9e80887009225f264a1ba84588f733caa8f0", "parents": [ "5f11161675be1351cadb96c83850e20bf5bcdc48" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Mon Nov 07 23:54:53 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Nov 07 23:54:53 2011 +0100" }, "message": "PM / devfreq: fix private_data\n\nThe \"private_date\" field in struct devfreq_dev_status almost certainly\nwants to be \"private_data\"; since there are no in-tree users of this\nfunctionality, now seems like an easy time to make the fix.\n\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "94956eed14b4b16d401c8ad36d68df0608f968cb", "tree": "60e4e1a3c2c44e8f6616db78cd6b22737b2a1f37", "parents": [ "50e696308c3fb18a4a0dae7b3a4d47469149c919", "e45a618753d5a8bc9086382f73bbc2d6a3399250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n forcedeth: fix a few sparse warnings (variable shadowing)\n forcedeth: Improve stats counters\n forcedeth: remove unneeded stats updates\n forcedeth: Acknowledge only interrupts that are being processed\n forcedeth: fix race when unloading module\n MAINTAINERS/rds: update maintainer\n wanrouter: Remove kernel_lock annotations\n usbnet: fix oops in usbnet_start_xmit\n ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n etherh: Add MAINTAINERS entry for etherh\n bonding: comparing a u8 with -1 is always false\n sky2: fix regression on Yukon Optima\n netlink: clarify attribute length check documentation\n netlink: validate NLA_MSECS length\n i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n macvlan: receive multicast with local address\n tg3: Update version to 3.121\n tg3: Eliminate timer race with reset_task\n tg3: Schedule at most one tg3_reset_task run\n tg3: Obtain PCI function number from device\n ...\n" }, { "commit": "3c00303206c3a1ccd86579efdc90bc35f140962e", "tree": "66170c84b5ddaeb102aea3530517a26657b6ea29", "parents": [ "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "efb90582c575084723cc14302c1300cb26c7e01f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n cpuidle: Single/Global registration of idle states\n cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n ACPI: Fix CONFIG_ACPI_DOCK\u003dn compiler warning\n ACPI: Export FADT pm_profile integer value to userspace\n thermal: Prevent polling from happening during system suspend\n ACPI: Drop ACPI_NO_HARDWARE_INIT\n ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()\n PNPACPI: Simplify disabled resource registration\n ACPI: Fix possible recursive locking in hwregs.c\n ACPI: use kstrdup()\n mrst pmu: update comment\n tools/power turbostat: less verbose debugging\n" }, { "commit": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "b32fc0a0629bf5894b35f33554c118aacfd0d1e2", "tree": "5d6aaa9a35b7fa63681adab91da3b3dec5276f84", "parents": [ "403299a8515c56db58454c57712f4dc96d6c1fde", "97ce2c88f9ad42e3c60a9beb9fca87abf3639faa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "message": "Merge branch \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n jump-label: initialize jump-label subsystem much earlier\n x86/jump_label: add arch_jump_label_transform_static()\n s390/jump-label: add arch_jump_label_transform_static()\n jump_label: add arch_jump_label_transform_static() to optimise non-live code updates\n sparc/jump_label: drop arch_jump_label_text_poke_early()\n x86/jump_label: drop arch_jump_label_text_poke_early()\n jump_label: if a key has already been initialized, don\u0027t nop it out\n stop_machine: make stop_machine safe and efficient to call early\n jump_label: use proper atomic_t initializer\n\nConflicts:\n - arch/x86/kernel/jump_label.c\n\tAdded __init_or_module to arch_jump_label_text_poke_early vs\n\tremoval of that function entirely\n - kernel/stop_machine.c\n\tsame patch (\"stop_machine: make stop_machine safe and efficient\n\tto call early\") merged twice, with whitespace fix in one version\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "208bca0860406d16398145ddd950036a737c3c9d", "tree": "7797a16c17d8bd155120126fa7976727fc6de013", "parents": [ "6aad3738f6a79fd0ca480eaceefe064cc471f6eb", "0e175a1835ffc979e55787774e58ec79e41957d7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:02:23 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:02:23 2011 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: Add a \u0027reason\u0027 to wb_writeback_work\n writeback: send work item to queue_io, move_expired_inodes\n writeback: trace event balance_dirty_pages\n writeback: trace event bdi_dirty_ratelimit\n writeback: fix ppc compile warnings on do_div(long long, unsigned long)\n writeback: per-bdi background threshold\n writeback: dirty position control - bdi reserve area\n writeback: control dirty pause time\n writeback: limit max dirty pause time\n writeback: IO-less balance_dirty_pages()\n writeback: per task dirty rate limit\n writeback: stabilize bdi-\u003edirty_ratelimit\n writeback: dirty rate control\n writeback: add bg_threshold parameter to __bdi_update_bandwidth()\n writeback: dirty position control\n writeback: account per-bdi accumulated dirtied pages\n" }, { "commit": "46bcfad7a819bd17ac4e831b04405152d59784ab", "tree": "20041e788154d103edff2699f88d4a30320e3ee2", "parents": [ "4202735e8ab6ecfb0381631a0d0b58fefe0bd4e2" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:42 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:58 2011 -0500" }, "message": "cpuidle: Single/Global registration of idle states\n\nThis patch makes the cpuidle_states structure global (single copy)\ninstead of per-cpu. The statistics needed on per-cpu basis\nby the governor are kept per-cpu. This simplifies the cpuidle\nsubsystem as state registration is done by single cpu only.\nHaving single copy of cpuidle_states saves memory. Rare case\nof asymmetric C-states can be handled within the cpuidle driver\nand architectures such as POWER do not have asymmetric C-states.\n\nHaving single/global registration of all the idle states,\ndynamic C-state transitions on x86 are handled by\nthe boot cpu. Here, the boot cpu would disable all the devices,\nre-populate the states and later enable all the devices,\nirrespective of the cpu that would receive the notification first.\n\nReference:\nhttps://lkml.org/lkml/2011/4/25/83\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "4202735e8ab6ecfb0381631a0d0b58fefe0bd4e2", "tree": "189e5aab466995128c5a9d5a2a4075a5db530674", "parents": [ "b25edc42bfb9602f0503474b2c94701d5536ce60" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:33 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:49 2011 -0500" }, "message": "cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n\nThis is the first step towards global registration of cpuidle\nstates. The statistics used primarily by the governor are per-cpu\nand have to be split from rest of the fields inside cpuidle_state,\nwhich would be made global i.e. single copy. The driver_data field\nis also per-cpu and moved.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "b25edc42bfb9602f0503474b2c94701d5536ce60", "tree": "5d3b8634606daa99fe5dc86ade108400ecf3a5fd", "parents": [ "e978aa7d7d57d04eb5f88a7507c4fb98577def77" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:24 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:43 2011 -0500" }, "message": "cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n\nThe cpuidle_device-\u003eprepare() mechanism causes updates to the\ncpuidle_state[].flags, setting and clearing CPUIDLE_FLAG_IGNORE\nto tell the governor not to chose a state on a per-cpu basis at\nrun-time. State demotion is now handled by the driver and it returns\nthe actual state entered. Hence, this mechanism is not required.\nAlso this removes per-cpu flags from cpuidle_state enabling\nit to be made global.\n\nReference:\nhttps://lkml.org/lkml/2011/3/25/52\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "e978aa7d7d57d04eb5f88a7507c4fb98577def77", "tree": "d6d6dfe1dba4d4749c7eafe348351aa499c3c5eb", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:09 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:30 2011 -0500" }, "message": "cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n\nCpuidle governor only suggests the state to enter using the\ngovernor-\u003eselect() interface, but allows the low level driver to\noverride the recommended state. The actual entered state\nmay be different because of software or hardware demotion. Software\ndemotion is done by the back-end cpuidle driver and can be accounted\ncorrectly. Current cpuidle code uses last_state field to capture the\nactual state entered and based on that updates the statistics for the\nstate entered.\n\nIdeally the driver enter routine should update the counters,\nand it should return the state actually entered rather than the time\nspent there. The generic cpuidle code should simply handle where\nthe counters live in the sysfs namespace, not updating the counters.\n\nReference:\nhttps://lkml.org/lkml/2011/3/25/52\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d4a2e61f0b7a7b5b9e321e776a1e874c02e847e4", "tree": "d90b71a99cb82809d56f9798f59d175b57562803", "parents": [ "0e4c9dc2f2e0fb6d3838eba34382fc6d2d1c381c", "2449b8ba0745327c5fa49a8d9acffe03b2eded69" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:28:32 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:28:32 2011 -0800" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree\n module: Enable dynamic debugging regardless of taint\n" }, { "commit": "1197ab2942f920f261952de0c392ac749a35796b", "tree": "4922ccc8a6061e5ece6ac7420001f3bf4524ea92", "parents": [ "ec773e99ab4abce07b1ae23117179c2861831964", "96cc017c5b7ec095ef047d3c1952b6b6bbf98943" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)\n powerpc/p3060qds: Add support for P3060QDS board\n powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX\n powerpc/85xx: Make kexec to interate over online cpus\n powerpc/fsl_booke: Fix comment in head_fsl_booke.S\n powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices\n powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver\n powerpc/85xx: Add \u0027fsl,pq3-gpio\u0027 compatiable for GPIO driver\n powerpc/86xx: Correct Gianfar support for GE boards\n powerpc/cpm: Clear muram before it is in use.\n drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager\n powerpc/fsl_msi: add support for \"msi-address-64\" property\n powerpc/85xx: Setup secondary cores PIR with hard SMP id\n powerpc/fsl-booke: Fix settlbcam for 64-bit\n powerpc/85xx: Adding DCSR node to dtsi device trees\n powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards\n powerpc/85xx: fix PHYS_64BIT selection for P1022DS\n powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map\n powerpc: respect mem\u003d setting for early memory limit setup\n powerpc: Update corenet64_smp_defconfig\n powerpc: Update mpc85xx/corenet 32-bit defconfigs\n ...\n\nFix up trivial conflicts in:\n - arch/powerpc/configs/40x/hcu4_defconfig\n\tremoved stale file, edited elsewhere\n - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:\n\tadded opal and gelic drivers vs added ePAPR driver\n - drivers/tty/serial/8250.c\n\tmoved UPIO_TSI to powerpc vs removed UPIO_DWAPB support\n" }, { "commit": "2449b8ba0745327c5fa49a8d9acffe03b2eded69", "tree": "48e11288635dcfc8cdb342f3ba00fa2a2a650aa8", "parents": [ "1cd0d6c3021c8d76641b37203f504634b87fbabc" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Mon Oct 24 15:12:28 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Nov 07 07:54:42 2011 +1030" }, "message": "module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree\n\nUse of the GPL or a compatible licence doesn\u0027t necessarily make the code\nany good. We already consider staging modules to be suspect, and this\nshould also be true for out-of-tree modules which may receive very\nlittle review.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nReviewed-by: Dave Jones \u003cdavej@redhat.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (patched oops-tracing.txt)\n" }, { "commit": "8110efc64c4790cd1bf7e30f080e5ba3faa7cb85", "tree": "708c2a1ef6bebce8eda9676c554bea366547678e", "parents": [ "06d8eb1b7d1eb34c76538dab791bc14136ebbc8f", "d6cc76856d353a3a9c43bead33210b9216dce332" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 17:54:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 17:54:18 2011 -0700" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Freezer: Revert 27920651fe \"PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too\"\n PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count\n USB: Update last_busy time after autosuspend fails\n PM / Runtime: Automatically retry failed autosuspends\n PM / QoS: Remove redundant check\n PM / OPP: Fix build when CONFIG_PM_OPP is not set\n PM / Runtime: Fix runtime accounting calculation error\n PM / Sleep: Update freezer documentation\n PM / Sleep: Remove unused symbol \u0027suspend_cpu_hotplug\u0027\n PM / Sleep: Fix race between CPU hotplug and freezer\n ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist\n" }, { "commit": "cd3f07d1e6e59fade92a8edaff9315cc534199cf", "tree": "a2f30bccdfad1826a81c098c6766c2a4345fc171", "parents": [ "dc822e57ee05856291a8c9324d2309076ee5f5e2", "f7c9c6bb14f3104608a3a83cadea10a6943d2804" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 15:32:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 05 15:32:53 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)\n [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev\n [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands\n [SCSI] scsi_transport_iscsi: Fix documentation os parameter\n [SCSI] mv_sas: OCZ RevoDrive3 \u0026 zDrive R4 support\n [SCSI] libfc: improve flogi retries to avoid lport stuck\n [SCSI] libfc: avoid exchanges collision during lport reset\n [SCSI] libfc: fix checking FC_TYPE_BLS\n [SCSI] edd: Treat \"XPRS\" host bus type the same as \"PCI\"\n [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)\n [SCSI] isci: revert bcn filtering\n [SCSI] isci: Fix hard reset timeout conditions.\n [SCSI] isci: No need to manage the pending reset bit on pending requests.\n [SCSI] isci: Remove redundant isci_request.ttype field.\n [SCSI] isci: Fix task management for SMP, SATA and on dev remove.\n [SCSI] isci: No task_done callbacks in error handler paths.\n [SCSI] isci: Handle task request timeouts correctly.\n [SCSI] isci: Fix tag leak in tasks and terminated requests.\n [SCSI] isci: Immediately fail I/O to removed devices.\n [SCSI] isci: Lookup device references through requests in completions.\n [SCSI] ipr: add definitions for additional adapter\n ...\n" }, { "commit": "fba9569924e06da076cb2ad12474bbd82d69f54d", "tree": "f0b7d9c82f8dd90f0dc757a4c00afc0872fc1484", "parents": [ "3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa", "4598fc2c94b68740e0269db03c98a1e7ad5af773" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 18:02:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 18:02:25 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)\n dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle\n dmaengine/ep93xx_dma: add module.h include\n pch_dma: Reduce wasting memory\n pch_dma: Fix suspend issue\n dma/timberdale: free_irq() on an error path\n dma: shdma: transfer based runtime PM\n dmaengine: shdma: protect against the IRQ handler\n dmaengine i.MX DMA/SDMA: add missing include of linux/module.h\n dmaengine: delete redundant chan_id and chancnt initialization in dma drivers\n dmaengine/amba-pl08x: Check txd-\u003ellis_va before freeing dma_pool\n dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers\n serial: sh-sci: don\u0027t filter on DMA device, use only channel ID\n ARM: SAMSUNG: Remove Samsung specific enum type for dma direction\n ASoC: Samsung: Update DMA interface\n spi/s3c64xx: Merge dma control code\n spi/s3c64xx: Add support DMA engine API\n ARM: SAMSUNG: Remove S3C-PL330-DMA driver\n ARM: S5P64X0: Use generic DMA PL330 driver\n ARM: S5PC100: Use generic DMA PL330 driver\n ARM: S5PV210: Use generic DMA PL330 driver\n ...\n\nFix up fairly trivial conflicts in\n - arch/arm/mach-exynos4/{Kconfig,clock.c}\n - arch/arm/mach-s5p64x0/dma.c\n" }, { "commit": "3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa", "tree": "11a85044d1472f5972ae47ce10a2f446ad981e9f", "parents": [ "b4fdcb02f1e39c27058a885905bd0277370ba441", "a0eda62552eba4e1f92d5354bb65c68fb6b45f87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:22:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:22:14 2011 -0700" }, "message": "Merge branch \u0027for-3.2/drivers\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.2/drivers\u0027 of git://git.kernel.dk/linux-block: (30 commits)\n virtio-blk: use ida to allocate disk index\n hpsa: add small delay when using PCI Power Management to reset for kump\n cciss: add small delay when using PCI Power Management to reset for kump\n xen/blkback: Fix two races in the handling of barrier requests.\n xen/blkback: Check for proper operation.\n xen/blkback: Fix the inhibition to map pages when discarding sector ranges.\n xen/blkback: Report VBD_WSECT (wr_sect) properly.\n xen/blkback: Support \u0027feature-barrier\u0027 aka old-style BARRIER requests.\n xen-blkfront: plug device number leak in xlblk_init() error path\n xen-blkfront: If no barrier or flush is supported, use invalid operation.\n xen-blkback: use kzalloc() in favor of kmalloc()+memset()\n xen-blkback: fixed indentation and comments\n xen-blkfront: fix a deadlock while handling discard response\n xen-blkfront: Handle discard requests.\n xen-blkback: Implement discard requests (\u0027feature-discard\u0027)\n xen-blkfront: add BLKIF_OP_DISCARD and discard request struct\n drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()\n drivers/block/loop.c: emit uevent on auto release\n drivers/block/cpqarray.c: use pci_dev-\u003erevision\n loop: always allow userspace partitions and optionally support automatic scanning\n ...\n\nFic up trivial header file includsion conflict in drivers/block/loop.c\n" }, { "commit": "b4fdcb02f1e39c27058a885905bd0277370ba441", "tree": "fd4cfd1994f21f44afe5e7904681fb5ac09f81b8", "parents": [ "044595d4e448305fbaec472eb7d22636d24e7d8c", "6dd9ad7df2019b1e33a372a501907db293ebcd0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:06:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 17:06:58 2011 -0700" }, "message": "Merge branch \u0027for-3.2/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.2/core\u0027 of git://git.kernel.dk/linux-block: (29 commits)\n block: don\u0027t call blk_drain_queue() if elevator is not up\n blk-throttle: use queue_is_locked() instead of lockdep_is_held()\n blk-throttle: Take blkcg-\u003elock while traversing blkcg-\u003epolicy_list\n blk-throttle: Free up policy node associated with deleted rule\n block: warn if tag is greater than real_max_depth.\n block: make gendisk hold a reference to its queue\n blk-flush: move the queue kick into\n blk-flush: fix invalid BUG_ON in blk_insert_flush\n block: Remove the control of complete cpu from bio.\n block: fix a typo in the blk-cgroup.h file\n block: initialize the bounce pool if high memory may be added later\n block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown\n block: drop @tsk from attempt_plug_merge() and explain sync rules\n block: make get_request[_wait]() fail if queue is dead\n block: reorganize throtl_get_tg() and blk_throtl_bio()\n block: reorganize queue draining\n block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()\n block: pass around REQ_* flags instead of broken down booleans during request alloc/free\n block: move blk_throtl prototypes to block/blk.h\n block: fix genhd refcounting in blkio_policy_parse_and_set()\n ...\n\nFix up trivial conflicts due to \"mddev_t\" -\u003e \"struct mddev\" conversion\nand making the request functions be of type \"void\" instead of \"int\" in\n - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}\n - drivers/staging/zram/zram_drv.c\n" }, { "commit": "19940b3d55c87d8089a8cb0fa8e5a9918a3846bd", "tree": "cae1abaac5efabe83003f4352d068bd7034ae6ae", "parents": [ "5a3ad6bd6ae0687cb0ecb424d74221920fbc7f38" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 19 18:05:05 2011 +0900" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Nov 04 23:24:59 2011 +0000" }, "message": "ASoC: Ensure we get an impedence reported for WM8958 jack detect\n\nOccasionally we may see an accessory reported before we have a stable\nimpedance for the accessory. If this happens then reread the status in\norder to ensure that the handler can take the appropriate action for the\nstatus change.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "589665f5a6008dbce1d0af2cb93e94a80bf78151", "tree": "4f4ec1949dd233a8474c2cb477da3637166b6e75", "parents": [ "27d240fdae2808d727ad9ce48ec029731a457524" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Nov 04 08:21:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 18:37:23 2011 -0400" }, "message": "bonding: comparing a u8 with -1 is always false\n\nslave-\u003eduplex is a u8 type so the in bond_info_show_slave() when we\ncheck \"if (slave-\u003eduplex \u003d\u003d -1)\", it\u0027s always false.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f35c4abd7f0294166a5e0ab0401fe7949b33034", "tree": "e8af20e67b4d08b1b819b7917104468df85210f8", "parents": [ "b2c0a863e14676fa5760c6d828fd373288e2f64a" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Nov 03 16:07:49 2011 -0700" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:15 2011 +0100" }, "message": "PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count\n\nCommit 27920651fe \"PM / Freezer: Make fake_signal_wake_up() wake\nTASK_KILLABLE tasks too\" updated fake_signal_wake_up() used by freezer\nto wake up KILLABLE tasks. Sending unsolicited wakeups to tasks in\nkillable sleep is dangerous as there are code paths which depend on\ntasks not waking up spuriously from KILLABLE sleep.\n\nFor example. sys_read() or page can sleep in TASK_KILLABLE assuming\nthat wait/down/whatever _killable can only fail if we can not return\nto the usermode. TASK_TRACED is another obvious example.\n\nThe offending commit was to resolve freezer hang during system PM\noperations caused by KILLABLE sleeps in network filesystems.\nwait_event_freezekillable(), which depends on the spurious KILLABLE\nwakeup, was added by f06ac72e92 \"cifs, freezer: add\nwait_event_freezekillable and have cifs use it\" to be used to\nimplement killable \u0026 freezable sleeps in network filesystems.\n\nTo prepare for reverting of 27920651fe, this patch reimplements\nwait_event_freezekillable() using freezer_do_not_count/freezer_count()\nso that it doesn\u0027t depend on the spurious KILLABLE wakeup. This isn\u0027t\nvery nice but should do for now.\n\n[tj: Refreshed patch to apply to linus/master and updated commit\n description on Rafael\u0027s request.]\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "a96d69d1b02c4a526bd8c07e0cb10c129025c88c", "tree": "bc4a0258ae5d48b541fd25d40c3594e050dd5ac9", "parents": [ "def0c0a37d02820497fcd5a74b6cc93dbce5dc06" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Nov 03 10:12:27 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:13 2011 +0100" }, "message": "PM / OPP: Fix build when CONFIG_PM_OPP is not set\n\nCommit 03ca370fbf7b76d6d002380dbdc2cdc2319f9c80 (PM / OPP: Add\nOPP availability change notifier) does not compile if CONFIG_PM_OPP\nis not set:\n\narch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier\u0027:\ninclude/linux/opp.h:103: multiple definition of `opp_get_notifier\u0027\ninclude/linux/opp.h:103: first defined here\n\nAlso fix incorrect comment.\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "4e71c9545b9afaa47f178b7ffda0bc630c8ad2c7", "tree": "bec7b57b17d9de21829d5d041cf6cf2389f9e544", "parents": [ "79cfbdfa87e84992d509e6c1648a18e1d7e68c20" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Thu Nov 03 00:59:40 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Nov 04 22:28:09 2011 +0100" }, "message": "PM / Sleep: Remove unused symbol \u0027suspend_cpu_hotplug\u0027\n\nRemove the suspend_cpu_hotplug declaration, which doesn\u0027t correspond\nto an existing variable.\n\n[rjw: Added the changelog.]\n\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "1788ea6e3b2a58cf4fb00206e362d9caff8d86a7", "tree": "24846fddf8b55f516f365a735defd79b6ea6d28a", "parents": [ "1583171492eb514e267c7b51e96846b38de0f544" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Fri Nov 04 13:31:21 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Nov 04 16:39:04 2011 -0400" }, "message": "nfs: when attempting to open a directory, fall back on normal lookup (try #5)\n\ncommit d953126 changed how nfs_atomic_lookup handles an -EISDIR return\nfrom an OPEN call. Prior to that patch, that caused the client to fall\nback to doing a normal lookup. When that patch went in, the code began\nreturning that error to userspace. The d_revalidate codepath however\nnever had the corresponding change, so it was still possible to end up\nwith a NULL ctx-\u003estate pointer after that.\n\nThat patch caused a regression. When we attempt to open a directory that\ndoes not have a cached dentry, that open now errors out with EISDIR. If\nyou attempt the same open with a cached dentry, it will succeed.\n\nFix this by reverting the change in nfs_atomic_lookup and allowing\nattempts to open directories to fall back to a normal lookup\n\nAlso, add a NFSv4-specific f_ops-\u003eopen routine that just returns\n-ENOTDIR. This should never be called if things are working properly,\nbut if it ever is, then the dprintk may help in debugging.\n\nTo facilitate this, a new file_operations field is also added to the\nnfs_rpc_ops struct.\n\nCc: stable@kernel.org\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6736c047995c560b73f3860095c631456b0bbea8", "tree": "1ef4d2ab9d7d2f2cd3fe26a3e9135fb312e81b85", "parents": [ "16dfd1faed8c5235d9a7c190b91b6d97d6cd3272", "6070295efc90d1093b2031c43380bd7d9673c802" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 12:27:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 12:27:43 2011 -0700" }, "message": "Merge branch \u0027nfs-for-3.2\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\n* \u0027nfs-for-3.2\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (25 commits)\n nfs: set vs_hidden on nfs4_callback_version4 (try #2)\n pnfs-obj: Support for RAID5 read-4-write interface.\n pnfs-obj: move to ore 03: Remove old raid engine\n pnfs-obj: move to ore 02: move to ORE\n pnfs-obj: move to ore 01: ore_layout \u0026 ore_components\n pnfs-obj: Rename objlayout_io_state \u003d\u003e objlayout_io_res\n pnfs-obj: Get rid of objlayout_{alloc,free}_io_state\n pnfs-obj: Return PNFS_NOT_ATTEMPTED in case of read/write_pagelist\n pnfs-obj: Remove redundant EOF from objlayout_io_state\n nfs: Remove unused variable from write.c\n nfs: Fix unused variable warning from file.c\n NFS: Remove no-op less-than-zero checks on unsigned variables.\n NFS: Clean up nfs4_xdr_dec_secinfo()\n NFS: Fix documenting comment for nfs_create_request()\n NFS4: fix cb_recallany decode error\n nfs4: serialize layoutcommit\n SUNRPC: remove rpcbind clients destruction on module cleanup\n SUNRPC: remove rpcbind clients creation during service registering\n NFSd: call svc rpcbind cleanup explicitly\n SUNRPC: cleanup service destruction\n ...\n" }, { "commit": "dd2c0ca1b153b555c09fd8e08f6842e12cf8e87b", "tree": "1c7490f128aa6153d8d42f9bb735cd4bd3aa16f2", "parents": [ "1a67a573b8d9f02211f36fbab50f6265dc49384a" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Mon Sep 19 18:51:13 2011 -0700" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat Nov 05 00:49:27 2011 +0900" }, "message": "sh: clkfwk: add clk_rate_mult_range_round()\n\nThis provides a clk_rate_mult_range_round() helper for use by some of the\nCPG PLL ranged multipliers, following the same approach as used by the\ndiv ranges.\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "1046a2c428bedd64c960dcfd0c57cc69a82fea2f", "tree": "d34b83e0ac61b51305cece031f7ff49579e3fe76", "parents": [ "46e85f5f1c2a1d106c1ec0fa2a06280276b8e052", "b3f4e1eba45eda5d1213810ef3bc53e5247df2df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 07:58:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 07:58:25 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)\n [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set\n [media] it913x [VER 1.07] Support for single ITE 9135 devices\n [media] Support for Terratec G1\n [media] cx25821: off by one in cx25821_vidioc_s_input()\n [media] media: tea5764: reconcile Kconfig symbol and macro\n [media] omap_vout: Add poll() support\n [media] omap3isp: preview: Add crop support on the sink pad\n [media] omap3isp: preview: Rename min/max input/output sizes defines\n [media] omap3isp: preview: Remove horizontal averager support\n [media] omap3isp: Report the ISP revision through the media controller API\n [media] omap3isp: ccdc: remove redundant operation\n [media] omap3isp: Fix memory leaks in initialization error paths\n [media] omap3isp: Add missing mutex_destroy() calls\n [media] omap3isp: Move *_init_entities() functions to the init/cleanup section\n [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()\n [media] MFC: Change MFC firmware binary name\n [media] vb2: add vb2_get_unmapped_area in vb2 core\n [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor\n [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control\n [media] media: ov6650: stylistic improvements\n ...\n" }, { "commit": "6b1506c66809ddf6afd17e330db2999c878b5d90", "tree": "eb93535fcc3e568ffabd5400b019463633ea2c22", "parents": [ "1a67a573b8d9f02211f36fbab50f6265dc49384a", "50e07f888cb24b55e0d8283f631907794dd757c2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 07:49:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 07:49:29 2011 -0700" }, "message": "Merge branch \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n dt: add empty of_machine_is_compatible\n ahci: add DT binding for Calxeda AHCI controller\n dt/platform: minor cleanup\n dt: add empty of_alias_get_id() for non-dt builds\n" }, { "commit": "3af1f8a41feab47b232b0c3d3b2322426672480d", "tree": "5c36c5ff8aa7e4d6285fa9abec60505feedfda7c", "parents": [ "1a67a573b8d9f02211f36fbab50f6265dc49384a" ], "author": { "name": "Phil Edworthy", "email": "phil.edworthy@renesas.com", "time": "Mon Oct 03 15:16:47 2011 +0100" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 04 22:33:30 2011 +0900" }, "message": "serial: sh-sci: Fix up SH-2A SCIF support.\n\nThis fixes up support for SH-2(A) SCIFs by introducing a new regtype. As\nexpected, it\u0027s close to the SH-4A SCIF with fifodata, but still different\nenough to warrant its own type.\n\nFixes up a number of FIFO overflows and similar for both SH7203/SH7264.\n\nSigned-off-by: Phil Edworthy \u003cphil.edworthy@renesas.com\u003e\nTested-by: Federico Fuga \u003cfuga@studiofuga.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "50e07f888cb24b55e0d8283f631907794dd757c2", "tree": "a57533a86c62ae90ffc600c4443fcbd8f7908c1e", "parents": [ "3983138c017b6aeab6ce3dbb1e9afbe80bdac496" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Oct 25 14:01:26 2011 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Nov 04 00:12:51 2011 -0400" }, "message": "dt: add empty of_machine_is_compatible\n\nThe patch adds an empty function for non-dt build, so that\ndrivers migrating to dt can save some \u0027#ifdef CONFIG_OF\u0027.\n\nv3: New patch\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "6dbbd92522a13bcd5003829cbed30bc38a3d0362", "tree": "b486642d7392b81d89f159d65fd556a432e78d16", "parents": [ "d6748066ad0e8b2514545998f8367ebb3906f299", "e1cfb67acd5e890bbad695000d2c997bfb7f1756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 21:05:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 21:05:43 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)\n be2net: Add detect UE feature for Lancer\n be2net: Prevent CQ full condition for Lancer\n be2net: Fix disabling multicast promiscous mode\n be2net: Fix endian issue in RX filter command\n af_packet: de-inline some helper functions\n MAINTAINERS: Add can-gw include to maintained files\n net: Add back alignment for size for __alloc_skb\n net: add missing bh_unlock_sock() calls\n l2tp: fix race in l2tp_recv_dequeue()\n ixgbevf: Update release version\n ixgbe: DCB, return max for IEEE traffic classes\n ixgbe: fix reading of the buffer returned by the firmware\n ixgbe: Fix compiler warnings\n ixgbe: fix smatch splat due to missing NULL check\n ixgbe: fix disabling of Tx laser at probe\n ixgbe: Fix link issues caused by a reset while interface is down\n igb: Fix for I347AT4 PHY cable length unit detection\n e100: make sure vlan support isn\u0027t advertised on old adapters\n e1000e: demote a debugging WARN to a debug log message\n net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c\n ...\n" }, { "commit": "3983138c017b6aeab6ce3dbb1e9afbe80bdac496", "tree": "9fdcddfdb8ada91504c90e2551ba6a565ade7325", "parents": [ "ed5f886d16369fed5a69d96b8e85777c47206de1", "02aac316abf436a7529d46a71f7083f9f9ef4b49" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Nov 03 23:32:20 2011 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Nov 03 23:32:20 2011 -0400" }, "message": "Merge branch \u0027for-grant\u0027 of git://sources.calxeda.com/kernel/linux into devicetree/merge\n" }, { "commit": "d26a6635b24210791cf4b71fd861738270c8cc3c", "tree": "2f5a40c24c58a456bf6882b372f8d7620cb9d9b0", "parents": [ "2e56d933fd967a72d5ee4250e1cb6f9de29d936f" ], "author": { "name": "Sylwester Nawrocki", "email": "s.nawrocki@samsung.com", "time": "Sun Sep 04 19:08:54 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Nov 03 18:29:09 2011 -0200" }, "message": "[media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control\n\nV4L2_CID_POWER_LINE_FREQUENCY control allows applications to instruct\na driver what is the power line frequency so an appropriate filter\ncan be used by the device to cancel flicker by compensating the light\nintensity ripple. Currently in the menu we have entries for 50 Hz and\n60 Hz and for entirely disabling the anti-flicker filter.\nHowever some devices are capable of automatically detecting the\nfrequency, so add V4L2_CID_POWER_LINE_FREQUENCY_AUTO entry for them.\n\nSigned-off-by: Sylwester Nawrocki \u003cs.nawrocki@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "09362ec25c3f42d00a4008d0622bfbca68e540f5", "tree": "8f9f27d2edad2647df00db89a70d180398b45bc9", "parents": [ "0934d94a52423fac35922c2e29d72a43db7ddd48" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Sep 07 18:07:23 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Nov 03 18:28:57 2011 -0200" }, "message": "[media] V4L: docbook documentation for struct v4l2_create_buffers\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2150158b31a3290cc883cf6dea4f5d6803b6b811", "tree": "1c06a0fa4688a14df0ed9a630656d7188fb4420a", "parents": [ "ebc087d0905c41d7fe450866eb1afd1f661cba76" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Sep 28 11:34:06 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Nov 03 18:28:24 2011 -0200" }, "message": "[media] V4L: add two new ioctl()s for multi-size videobuffer management\n\nA possibility to preallocate and initialise buffers of different sizes\nin V4L2 is required for an efficient implementation of a snapshot\nmode. This patch adds two new ioctl()s: VIDIOC_CREATE_BUFS and\nVIDIOC_PREPARE_BUF and defines respective data structures.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "a0a4194c943bc64dd7b6e26cccb036cb26b81363", "tree": "4282f0dd573344d10f69616eb05868b5cd563cc1", "parents": [ "cf0223503e6198292cdcc864e01eeb5fe7490752", "b958f7a7cbdfbf59ba61de7ebb9c59b0ee3a7967" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 09:40:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 09:40:51 2011 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.infradead.org/users/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)\n mfd: Fix missing abx500 header file updates\n mfd: Add missing \u003clinux/io.h\u003e include to intel_msic\n x86, mrst: add platform support for MSIC MFD driver\n mfd: Expose TurnOnStatus in ab8500 sysfs\n mfd: Remove support for early drop ab8500 chip\n mfd: Add support for ab8500 v3.3\n mfd: Add ab8500 interrupt disable hook\n mfd: Convert db8500-prcmu panic() into pr_crit()\n mfd: Refactor db8500-prcmu request_clock() function\n mfd: Rename db8500-prcmu init function\n mfd: Fix db5500-prcmu defines\n mfd: db8500-prcmu voltage domain consumers additions\n mfd: db8500-prcmu reset code retrieval\n mfd: db8500-prcmu tweak for modem wakeup\n mfd: Add db8500-pcmu watchdog accessor functions for watchdog\n mfd: hwacc power state db8500-prcmu accessor\n mfd: Add db8500-prcmu accessors for PLL and SGA clock\n mfd: Move to the new db500 PRCMU API\n mfd: Create a common interface for dbx500 PRCMU drivers\n mfd: Initialize DB8500 PRCMU regs\n ...\n\nFix up trivial conflicts in\n\tarch/arm/mach-imx/mach-mx31moboard.c\n\tarch/arm/mach-omap2/board-omap3beagle.c\n\tarch/arm/mach-u300/include/mach/irqs.h\n\tdrivers/mfd/wm831x-spi.c\n" }, { "commit": "cf0223503e6198292cdcc864e01eeb5fe7490752", "tree": "5ed99ae5fc7a67ec19df19f4b46b0c04d97db174", "parents": [ "3f8ddb032afa729d4bad1bf2965d3ec068de6b72", "e857bfd4604a3a4edaf9c7038db880d9f78aecbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 08:22:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 08:22:06 2011 -0700" }, "message": "Merge branch \u0027sh-latest\u0027 of git://github.com/pmundt/linux-sh\n\n* \u0027sh-latest\u0027 of git://github.com/pmundt/linux-sh:\n sh: Add default uImage rule for sh7757lcr\n sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr\n sh: userimask.c needs linux/stat.h\n sh: pfc: Add GPIO IRQ support\n sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards\n sh: pfc: Remove unused gpio_in_use member\n sh: add parameters for EHCI and RIIC in clock-sh7757.c\n sh: kexec: Add PHYSICAL_START\n SH: irq: Remove IRQF_DISABLED\n sh: pfc: get_config_reg() shift clean up\n sh: intc: Add IRQ trigger bit field check\n sh: drop unused Kconfig symbol\n sh: Fix implicit declaration of function numa_node_id\n sh: kexec: Register crashk_res\n sh: ecovec: add renesas_usbhs DMAEngine support\n" }, { "commit": "3f8ddb032afa729d4bad1bf2965d3ec068de6b72", "tree": "f2467d1160ee8cd4016fb77c09d0f1f4c768e5fe", "parents": [ "30307c69d59b14723fbf8a524847b302388c702d", "8b37fcfc9b3400b647748783a2cafff67793e0ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 08:05:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 08:05:35 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:\n hwspinlock: add MAINTAINERS entries\n hwspinlock/omap: omap_hwspinlock_remove should be __devexit\n hwspinlock/u8500: add hwspinlock driver\n hwspinlock/core: register a bank of hwspinlocks in a single API call\n hwspinlock/core: remove stubs for register/unregister\n hwspinlock/core: use a mutex to protect the radix tree\n hwspinlock/core/omap: fix id issues on multiple hwspinlock devices\n hwspinlock/omap: simplify allocation scheme\n hwspinlock/core: simplify \u0027owner\u0027 handling\n hwspinlock/core: simplify Kconfig\n\nFix up trivial conflicts (addition of omap_hwspinlock_pdata, removal of\nomap_spinlock_latency) in arch/arm/mach-omap2/hwspinlock.c\n\nAlso, do an \"evil merge\" to fix a compile error in omap_hsmmc.c which\nfor some reason was reported in the same email thread as the \"please\npull hwspinlock changes\".\n" }, { "commit": "31cbecb4ab538f433145bc5a46f3bea9b9627031", "tree": "d6206d42dea7298f7ef05fd1f7bf474245f0d43a", "parents": [ "2b72c9ccd22c4a3299e5a358dcd639fb253730f4", "278c023a99b0d6b471d0f4a79835c703482e29ac" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Nov 02 23:56:40 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Nov 02 23:56:40 2011 -0400" }, "message": "Merge branch \u0027osd-devel\u0027 into nfs-for-next\n" }, { "commit": "43672a0784707d795556b1f93925da8b8e797d03", "tree": "5c92aabd211281300f89fc2e69e9ee7e58bcc449", "parents": [ "2380078cdb7e6d520e33dcf834e0be979d542e48", "2e727c3ca1beff05f27b6207a795790f222bf8d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 17:02:37 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 17:02:37 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm:\n dm: raid fix device status indicator when array initializing\n dm log userspace: add log device dependency\n dm log userspace: fix comment hyphens\n dm: add thin provisioning target\n dm: add persistent data library\n dm: add bufio\n dm: export dm get md\n dm table: add immutable feature\n dm table: add always writeable feature\n dm table: add singleton feature\n dm kcopyd: add dm_kcopyd_zero to zero an area\n dm: remove superfluous smp_mb\n dm: use local printk ratelimit\n dm table: propagate non rotational flag\n" }, { "commit": "6681ba7ec480bc839584fd0817991d248b4b9e44", "tree": "994fb1de40d58ce8dac821cf1fec727e2f902f47", "parents": [ "06ef93e1b8405acac6ec900564e3ad1a8e3a72b2", "4d096ca7e65584dd5845e64c6400f920e694f672" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:55:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:55:15 2011 -0700" }, "message": "Merge branch \u0027linux_next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac\n\n* \u0027linux_next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (21 commits)\n MAINTAINERS: add an entry for Edac Sandy Bridge driver\n edac: tag sb_edac as EXPERIMENTAL, as it requires more testing\n EDAC: Fix incorrect edac mode reporting in sb_edac\n edac: sb_edac: Add it to the building system\n edac: Add an experimental new driver to support Sandy Bridge CPU\u0027s\n i7300_edac: Fix error cleanup logic\n i7core_edac: Initialize memory name with cpu, channel, bank\n i7core_edac: Fix compilation on 32 bits arch\n i7core_edac: scrubbing fixups\n EDAC: Correct Kconfig dependencies\n i7core_edac: return -ENODEV if no MC is found\n i7core_edac: use edac\u0027s own way to print errors\n MAINTAINERS: remove dropped edac_mce.* from the file\n i7core_edac: Drop the edac_mce facility\n x86, MCE: Use notifier chain only for MCE decoding\n EDAC i7core: Use mce socketid for better compatibility\n i7core_edac: Don\u0027t enable memory scrubbing for Xeon 35xx\n i7core_edac: Add scrubbing support\n edac: Move edac main structs to include/linux/edac.h\n i7core_edac: Fix oops when trying to inject errors\n ...\n" }, { "commit": "092f4c56c1927e4b61a41ee8055005f1cb437009", "tree": "616ceb54b7671ccc13922ae9e002b8b972f6e09e", "parents": [ "80c2861672bbf000f6af838656959ee937e4ee4d", "c1e2ee2dc436574880758b3836fc96935b774c32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:27 2011 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s incoming - part two)\n\nSays Andrew:\n\n \"60 patches. That\u0027s good enough for -rc1 I guess. I have quite a lot\n of detritus to be rechecked, work through maintainers, etc.\n\n - most of the remains of MM\n - rtc\n - various misc\n - cgroups\n - memcg\n - cpusets\n - procfs\n - ipc\n - rapidio\n - sysctl\n - pps\n - w1\n - drivers/misc\n - aio\"\n\n* akpm: (60 commits)\n memcg: replace ss-\u003eid_lock with a rwlock\n aio: allocate kiocbs in batches\n drivers/misc/vmw_balloon.c: fix typo in code comment\n drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop\n w1: disable irqs in critical section\n drivers/w1/w1_int.c: multiple masters used same init_name\n drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal\n drivers/power/ds2780_battery.c: add a nolock function to w1 interface\n drivers/power/ds2780_battery.c: create central point for calling w1 interface\n w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it\n pps gpio client: add missing dependency\n pps: new client driver using GPIO\n pps: default echo function\n include/linux/dma-mapping.h: add dma_zalloc_coherent()\n sysctl: make CONFIG_SYSCTL_SYSCALL default to n\n sysctl: add support for poll()\n RapidIO: documentation update\n drivers/net/rionet.c: fix ethernet address macros for LE platforms\n RapidIO: fix potential null deref in rio_setup_device()\n RapidIO: add mport driver for Tsi721 bridge\n ...\n" }, { "commit": "c1e2ee2dc436574880758b3836fc96935b774c32", "tree": "aa496a9ba20e06749194faa4dbb14b6046e6b06b", "parents": [ "080d676de095a14ecba14c0b9a91acb5bbb634df" ], "author": { "name": "Andrew Bresticker", "email": "abrestic@google.com", "time": "Wed Nov 02 13:40:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:03 2011 -0700" }, "message": "memcg: replace ss-\u003eid_lock with a rwlock\n\nWhile back-porting Johannes Weiner\u0027s patch \"mm: memcg-aware global\nreclaim\" for an internal effort, we noticed a significant performance\nregression during page-reclaim heavy workloads due to high contention of\nthe ss-\u003eid_lock. This lock protects idr map, and serializes calls to\nidr_get_next() in css_get_next() (which is used during the memcg hierarchy\nwalk).\n\nSince idr_get_next() is just doing a look up, we need only serialize it\nwith respect to idr_remove()/idr_get_new(). By making the ss-\u003eid_lock a\nrwlock, contention is greatly reduced and performance improves.\n\nTested: cat a 256m file from a ramdisk in a 128m container 50 times on\neach core (one file + container per core) in parallel on a NUMA machine.\nResult is the time for the test to complete in 1 of the containers.\nBoth kernels included Johannes\u0027 memcg-aware global reclaim patches.\n\nBefore rwlock patch: 1710.778s\nAfter rwlock patch: 152.227s\n\nSigned-off-by: Andrew Bresticker \u003cabrestic@google.com\u003e\nCc: Paul Menage \u003cmenage@gmail.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "080d676de095a14ecba14c0b9a91acb5bbb634df", "tree": "4a4c56bc86a8edf4a42f8ec7c65ba795997e50ab", "parents": [ "2ca02df6b098be2d33a99a65531dcd84a10b6e21" ], "author": { "name": "Jeff Moyer", "email": "jmoyer@redhat.com", "time": "Wed Nov 02 13:40:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:03 2011 -0700" }, "message": "aio: allocate kiocbs in batches\n\nIn testing aio on a fast storage device, I found that the context lock\ntakes up a fair amount of cpu time in the I/O submission path. The reason\nis that we take it for every I/O submitted (see __aio_get_req). Since we\nknow how many I/Os are passed to io_submit, we can preallocate the kiocbs\nin batches, reducing the number of times we take and release the lock.\n\nIn my testing, I was able to reduce the amount of time spent in\n_raw_spin_lock_irq by .56% (average of 3 runs). The command I used to\ntest this was:\n\n aio-stress -O -o 2 -o 3 -r 8 -d 128 -b 32 -i 32 -s 16384 \u003cdev\u003e\n\nI also tested the patch with various numbers of events passed to\nio_submit, and I ran the xfstests aio group of tests to ensure I didn\u0027t\nbreak anything.\n\nSigned-off-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Daniel Ehrenberg \u003cdehrenberg@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "161520451dfacd0eb79d501933f47d3fb7464938", "tree": "6a3f613d005d32cdf7aeb725bac00ed55c45b929", "parents": [ "437c53418616973071fd2d7c87497780944d8fdb" ], "author": { "name": "James Nuss", "email": "jamesnuss@nanometrics.ca", "time": "Wed Nov 02 13:39:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:02 2011 -0700" }, "message": "pps: new client driver using GPIO\n\nThis client driver allows you to use a GPIO pin as a source for PPS\nsignals. Platform data [1] are used to specify the GPIO pin number,\nlabel, assert event edge type, and whether clear events are captured.\n\nThis driver is based on the work by Ricardo Martins who submitted an\ninitial implementation [2] of a PPS IRQ client driver to the linuxpps\nmailing-list on Dec 3 2010.\n\n[1] include/linux/pps-gpio.h\n[2] http://ml.enneenne.com/pipermail/linuxpps/2010-December/004155.html\n\n[akpm@linux-foundation.org: remove unneeded cast of void*]\nSigned-off-by: James Nuss \u003cjamesnuss@nanometrics.ca\u003e\nCc: Ricardo Martins \u003crasm@fe.up.pt\u003e\nAcked-by: Rodolfo Giometti \u003cgiometti@linux.it\u003e\nSigned-off-by: Ricardo Martins \u003crasm@fe.up.pt\u003e\nCc: Alexander Gordeev \u003clasaine@lvk.cs.msu.su\u003e\nCc: Igor Plyatov \u003cplyatov@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": "842fa69f3e0c9a178b294e7af7c07f4c9d9e7af2", "tree": "5c7b18074454b5ffa8e11175cfe7de08e6549ca7", "parents": [ "c736de60aed869df8a9aba512cdaf89e32545b00" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Nov 02 13:39:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:02 2011 -0700" }, "message": "include/linux/dma-mapping.h: add dma_zalloc_coherent()\n\nLots of driver code does a dma_alloc_coherent() and then zeroes out the\nmemory with a memset. Make it easy for them.\n\nCc: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "f1ecf06854a66ee663f4d4cf029c78cd62a15e04" }