)]}' { "log": [ { "commit": "ce8b04aa6c9bdf211b921fdd18c040ea29516b97", "tree": "9c45ed4ce13c1e956397bcef8d2f500dd8fac805", "parents": [ "0b60f9ead5d4816e7e3d6e28f4a0d22d4a1b2513" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Feb 03 14:03:05 2014 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 07 15:42:41 2014 -0800" }, "message": "sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()\n\nAll device_schedule_callback_owner() users are converted to use\ndevice_remove_file_self(). Remove now unused\n{sysfs|device}_schedule_callback_owner().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "0b60f9ead5d4816e7e3d6e28f4a0d22d4a1b2513", "tree": "2c46f7db6815641b51553b3c4bfa5a76e0ccd06d", "parents": [ "ac0ece9174aca9aa895ce0accc54f1f8ff12d117" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Feb 03 14:03:04 2014 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 07 15:42:41 2014 -0800" }, "message": "s390: use device_remove_file_self() instead of device_schedule_callback()\n\ndriver-core now supports synchrnous self-deletion of attributes and\nthe asynchrnous removal mechanism is scheduled for removal. Use it\ninstead of device_schedule_callback().\n\n* Conversions in arch/s390/pci/pci_sysfs.c and\n drivers/s390/block/dcssblk.c are straightforward.\n\n* drivers/s390/cio/ccwgroup.c is a bit more tricky because\n ccwgroup_notifier() was (ab)using device_schedule_callback() to\n purely obtain a process context to kick off ungroup operation which\n may block from a notifier callback.\n\n Rename ccwgroup_ungroup_callback() to ccwgroup_ungroup() and make it\n take ccwgroup_device * instead. The new function is now called\n directly from ccwgroup_ungroup_store().\n\n ccwgroup_notifier() chain is updated to explicitly bounce through\n ccwgroup_device-\u003eungroup_work. This also removes possible failure\n from memory pressure.\n\nOnly compile-tested.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: linux390@de.ibm.com\nCc: linux-s390@vger.kernel.org\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "ac0ece9174aca9aa895ce0accc54f1f8ff12d117", "tree": "82b9f44feda06f9223406989a5472b66213e164a", "parents": [ "bc6caf02cccedd30c9458e26dfdd8118af574ae5" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Feb 03 14:03:03 2014 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 07 15:42:41 2014 -0800" }, "message": "scsi: use device_remove_file_self() instead of device_schedule_callback()\n\ndriver-core now supports synchrnous self-deletion of attributes and\nthe asynchrnous removal mechanism is scheduled for removal. Use it\ninstead of device_schedule_callback(). This makes \"delete\" behave\nsynchronously.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \"James E.J. Bottomley\" \u003cJBottomley@parallels.com\u003e\nCc: linux-scsi@vger.kernel.org\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "bc6caf02cccedd30c9458e26dfdd8118af574ae5", "tree": "9c0f72f4ba0001d4ddcca7122a0243c2ccb1bb54", "parents": [ "6b0afc2a21726b2d6b6aa441af40cafaf5405cc8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Feb 03 14:03:02 2014 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 07 15:42:41 2014 -0800" }, "message": "pci: use device_remove_file_self() instead of device_schedule_callback()\n\ndriver-core now supports synchrnous self-deletion of attributes and\nthe asynchrnous removal mechanism is scheduled for removal. Use it\ninstead of device_schedule_callback(). This makes \"remove\" behave\nsynchronously.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nCc: linux-pci@vger.kernel.org\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "6b0afc2a21726b2d6b6aa441af40cafaf5405cc8", "tree": "42db14d4525a9f7a248fda6bb56da7823bd86e12", "parents": [ "81c173cb5e87fbb47ccd80630faefe39bbf68449" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Feb 03 14:03:01 2014 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 07 15:42:41 2014 -0800" }, "message": "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers\n\nSometimes it\u0027s necessary to implement a node which wants to delete\nnodes including itself. This isn\u0027t straightforward because of kernfs\nactive reference. While a file operation is in progress, an active\nreference is held and kernfs_remove() waits for all such references to\ndrain before completing. For a self-deleting node, this is a deadlock\nas kernfs_remove() ends up waiting for an active reference that itself\nis sitting on top of.\n\nThis currently is worked around in the sysfs layer using\nsysfs_schedule_callback() which makes such removals asynchronous.\nWhile it works, it\u0027s rather cumbersome and inherently breaks\nsynchronicity of the operation - the file operation which triggered\nthe operation may complete before the removal is finished (or even\nstarted) and the removal may fail asynchronously. If a removal\noperation is immmediately followed by another operation which expects\nthe specific name to be available (e.g. removal followed by rename\nonto the same name), there\u0027s no way to make the latter operation\nreliable.\n\nThe thing is there\u0027s no inherent reason for this to be asynchrnous.\nAll that\u0027s necessary to do this synchronous is a dedicated operation\nwhich drops its own active ref and deactivates self. This patch\nimplements kernfs_remove_self() and its wrappers in sysfs and driver\ncore. kernfs_remove_self() is to be called from one of the file\noperations, drops the active ref the task is holding, removes the self\nnode, and restores active ref to the dead node so that the ref is\nbalanced afterwards. __kernfs_remove() is updated so that it takes an\nearly exit if the target node is already fully removed so that the\nactive ref restored by kernfs_remove_self() after removal doesn\u0027t\nconfuse the deactivation path.\n\nThis makes implementing self-deleting nodes very easy. The normal\nremoval path doesn\u0027t even need to be changed to use\nkernfs_remove_self() for the self-deleting node. The method can\ninvoke kernfs_remove_self() on itself before proceeding the normal\nremoval path. kernfs_remove() invoked on the node by the normal\ndeletion path will simply be ignored.\n\nThis will replace sysfs_schedule_callback(). A subtle feature of\nsysfs_schedule_callback() is that it collapses multiple invocations -\neven if multiple removals are triggered, the removal callback is run\nonly once. An equivalent effect can be achieved by testing the return\nvalue of kernfs_remove_self() - only the one which gets %true return\nvalue should proceed with actual deletion. All other instances of\nkernfs_remove_self() will wait till the enclosing kernfs operation\nwhich invoked the winning instance of kernfs_remove_self() finishes\nand then return %false. This trivially makes all users of\nkernfs_remove_self() automatically show correct synchronous behavior\neven when there are multiple concurrent operations - all \"echo 1 \u003e\ndelete\" instances will finish only after the whole operation is\ncompleted by one of the instances.\n\nNote that manipulation of active ref is implemented in separate public\nfunctions - kernfs_[un]break_active_protection().\nkernfs_remove_self() is the only user at the moment but this will be\nused to cater to more complex cases.\n\nv2: For !CONFIG_SYSFS, dummy version kernfs_remove_self() was missing\n and sysfs_remove_file_self() had incorrect return type. Fix it.\n Reported by kbuild test bot.\n\nv3: kernfs_[un]break_active_protection() separated out from\n kernfs_remove_self() and exposed as public API.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: kbuild test robot \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "fee0c54e28f6ca187add93dfca226a8093cfa931", "tree": "d62c8c58d90fda69cf035b36c457a8ce9df945ca", "parents": [ "38dbfb59d1175ef458d006556061adeaa8751b72" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Dec 20 16:43:50 2013 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 07 14:21:09 2014 -0800" }, "message": "dma-buf: avoid using IS_ERR_OR_NULL\n\ndma_buf_map_attachment and dma_buf_vmap can return NULL or\nERR_PTR on a error. This encourages a common buggy pattern in\ncallers:\n\tsgt \u003d dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);\n\tif (IS_ERR_OR_NULL(sgt))\n return PTR_ERR(sgt);\n\nThis causes the caller to return 0 on an error. IS_ERR_OR_NULL\nis almost always a sign of poorly-defined error handling.\n\nThis patch converts dma_buf_map_attachment to always return\nERR_PTR, and fixes the callers that incorrectly handled NULL.\nThere are a few more callers that were not checking for NULL\nat all, which would have dereferenced a NULL pointer later.\nThere are also a few more callers that correctly handled NULL\nand ERR_PTR differently, I left those alone but they could also\nbe modified to delete the NULL check.\n\nThis patch also converts dma_buf_vmap to always return NULL.\nAll the callers to dma_buf_vmap only check for NULL, and would\nhave dereferenced an ERR_PTR and panic\u0027d if one was ever\nreturned. This is not consistent with the rest of the dma buf\nAPIs, but matches the expectations of all of the callers.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nReviewed-by: Rob Clark \u003crobdclark@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "8a10bc9d27ceb084b0d8be621a033a475eb9fdfd", "tree": "82f4a7f84bb52f5e82e4a5154ba0d317581c9762", "parents": [ "602456bf169926d331246de9cc5593b962cea0dc" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Fri Jan 31 15:39:40 2014 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sun Feb 02 20:56:47 2014 +0100" }, "message": "parisc/sti_console: prefer Linux fonts over built-in ROM fonts\n\nThe built-in ROM fonts lack many necessary ASCII characters, which is\nwhy it makes sens to prefer the Linux fonts instead if they are\navailable. This makes consoles on STI graphics cards which are not\nsupported by the stifb driver (e.g. Visualize FXe) looks much nicer.\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\nCc: stable@vger.kernel.org # v3.13\n" }, { "commit": "602456bf169926d331246de9cc5593b962cea0dc", "tree": "298ebcd418c2cd0a5e37357c3e9718f405f9052b", "parents": [ "7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5", "632007e2011e5d4269ddb88c0a636b9d9e3c8a13" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 02 11:30:57 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 02 11:30:57 2014 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\nPull hwmon kconfig fixes from Jean Delvare.\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors\n hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors\n" }, { "commit": "e4c0da21650185cb7df6685c5437dad0e9f77028", "tree": "b51550b258992ca4e9c0f979b55d1a3e20272e17", "parents": [ "5cb480f6b488128140c940abff3c36f524a334a8", "f39aa2753724215706d150fac5cb4a989793faef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 02 11:11:06 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 02 11:11:06 2014 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"Here\u0027s a set of patches for (hopefully) -rc1. Some of them are fixes,\n but a good number of them also do things such as enable new drivers in\n the defconfigs for platforms that have such devices, increases\n coverage of the multiplatform defconfig and some DTS changes that\n plumbs up some of the devices that now have bindings and driver\n support.\n\n The commit dates are recent; we\u0027ve mostly collected these fixes in the\n last few days but I also had to rebuild the branch yesterday to sort\n out some internal conflicts which reset the timestamps. The changes\n should have been tested by each platform maintainer already (and few\n of them have cross-platform impact) so I\u0027m personally not too\n concerned by it at this time\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)\n ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA\n ARM: multi_v7_defconfig: add mvebu drivers\n clocksource: kona: Add basic use of external clock\n drivers: bus: fix CCI driver kcalloc call parameters swap\n ARM: dts: bcm28155-ap: Fix Card Detection GPIO\n ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY\n ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set\n MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers\n ARM: dts: zynq: Add SDHCI nodes\n ARM: hisi: don\u0027t select SMP\n ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS\n ARM: multi_v7: copy most options from tegra_defconfig\n ARM: iop32x: fix power off handling for the EM7210 board\n ARM: integrator: restore static map on the CP\n ARM: msm_defconfig: Enable MSM clock drivers\n ARM: dts: msm: Add clock controller nodes and hook into uart\n ARM: OMAP4+: move errata initialization to omap4_pm_init_early\n ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle\n ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)\n ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference\n ...\n" }, { "commit": "632007e2011e5d4269ddb88c0a636b9d9e3c8a13", "tree": "2563b13d6524632df9186082e66279307f166f1f", "parents": [ "920130a9de4a833f22c0166a4941e18b88a67f01" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sun Feb 02 17:59:07 2014 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Sun Feb 02 17:59:07 2014 +0100" }, "message": "hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors\n\nSimilar to what was done for the lm75 driver.\n\nAdd depends on THERMAL since that is what provides the\nregister/unregister functions above, but only if THERMAL_OF was\nselected as this is an optional feature of the driver.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Randy Dunlap \u003crdunlap@infradead.org\u003e\nAcked-by: Eduardo Valentin \u003ceduardo.valentin@ti.com\u003e\nReviewed-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\n" }, { "commit": "920130a9de4a833f22c0166a4941e18b88a67f01", "tree": "542a48173823e267779cb6c3318ff3838a4a0380", "parents": [ "5cb480f6b488128140c940abff3c36f524a334a8" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sun Feb 02 17:59:07 2014 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Sun Feb 02 17:59:07 2014 +0100" }, "message": "hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors\n\nBased on an earlier attempt by Randy Dunlap.\n\nFix SENSORS_LM75 dependencies to eliminate build errors:\n\ndrivers/built-in.o: In function `lm75_remove\u0027:\nlm75.c:(.text+0x12bd8c): undefined reference to `thermal_zone_of_sensor_unregister\u0027\ndrivers/built-in.o: In function `lm75_probe\u0027:\nlm75.c:(.text+0x12c123): undefined reference to `thermal_zone_of_sensor_register\u0027\n\nAdd depends on THERMAL since that is what provides the\nregister/unregister functions above, but only if THERMAL_OF was\nselected as this is an optional feature of the driver.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Randy Dunlap \u003crdunlap@infradead.org\u003e\nAcked-by: Eduardo Valentin \u003ceduardo.valentin@ti.com\u003e\nReviewed-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\n" }, { "commit": "fea8893da7c52906caa1a8dc3199f4b2ed3b8dbd", "tree": "56e3482be95e2f1bd1386ecb3bc104a55f68f5e7", "parents": [ "04480094de7242d08bb62088e713fd7fe00443b4", "d7216f8f02da54f8f235c5cca562a55b7f52210d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 01 10:29:59 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 01 10:29:59 2014 -0800" }, "message": "Merge tag \u0027staging-3.14-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull rtl8812ae staging wireless driver from Greg KH:\n \"Here\u0027s a single staging driver for a wireless chipset that has shown\n up in the SteamBox hardware. It is merged separately from the \"main\"\n staging pull request to sync up with the wireless api changes that\n came in from the networking tree.\n\n It\u0027s self-contained and works for me and others. Larry will be\n replacing it with a \"real\" driver for 3.15, but for now this one is\n needed\"\n\n* tag \u0027staging-3.14-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:\n staging: r8821ae: Enable build by reverting BROKEN marking\n staging: r8821ae: Fix build problems\n Staging: rtl8812ae: disable due to build errors\n Staging: rtl8821ae: add TODO file\n Staging: rtl8821ae: removed unused functions and variables\n Staging: rtl8821ae: rc.c: fix up function prototypes\n Staging: rtl8812ae: Add Realtek 8821 PCI WIFI driver\n" }, { "commit": "04480094de7242d08bb62088e713fd7fe00443b4", "tree": "a8a9806a3f55f5343b6375743c8e107e800c6df6", "parents": [ "8a1f006ad302ea178aefb1f8c67e679c696289e9" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Sat Feb 01 15:38:29 2014 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 01 10:24:31 2014 -0800" }, "message": "Revert \"PCI: Remove from bus_list and release resources in pci_release_dev()\"\n\nRevert commit ef83b0781a73 \"PCI: Remove from bus_list and release\nresources in pci_release_dev()\" that made some nasty race conditions\nbecome possible. For example, if a Thunderbolt link is unplugged\nand then replugged immediately, the pci_release_dev() resulting from\nthe hot-remove code path may be racing with the hot-add code path\nwhich after that commit causes various kinds of breakage to happen\n(up to and including a hard crash of the whole system).\n\nMoreover, the problem that commit ef83b0781a73 attempted to address\ncannot happen any more after commit 8a4c5c329de7 \"PCI: Check parent\nkobject in pci_destroy_dev()\", because pci_destroy_dev() will now\nreturn immediately if it has already been executed for the given\ndevice.\n\nNote, however, that the invocation of msi_remove_pci_irq_vectors()\nremoved by commit ef83b0781a73 from pci_free_resources() along with\nthe other changes made by it is not added back because of subsequent\ncode changes depending on that modification.\n\nFixes: ef83b0781a73 (PCI: Remove from bus_list and release resources in pci_release_dev())\nReported-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "50ac206102660fe29e75d8a685178db95c530f4f", "tree": "d033fa45dffe2d34260feefe9d8bce9b14610a75", "parents": [ "7c762036e2480bfd43e62ed872b82e372fe92474" ], "author": { "name": "Tim Kryger", "email": "tim.kryger@linaro.org", "time": "Thu Dec 05 11:20:43 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jan 31 21:04:01 2014 -0800" }, "message": "clocksource: kona: Add basic use of external clock\n\nWhen an clock is specified in the device tree, enable it and use it to\ndetermine the external clock frequency.\n\nSigned-off-by: Tim Kryger \u003ctim.kryger@linaro.org\u003e\nReviewed-by: Markus Mayer \u003cmarkus.mayer@linaro.org\u003e\nReviewed-by: Matt Porter \u003cmatt.porter@linaro.org\u003e\nReviewed-by: Christian Daudt \u003cbcm@fixthebug.org\u003e\nAcked-by: Daniel Lezcano \u003cdaniel.lezcano@linaro.org\u003e\nSigned-off-by: Christian Daudt \u003cbcm@fixthebug.org\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "4e13c5d0212f25d69a97606b9d5a85edb52a7737", "tree": "002f59b9151f42a6388656762f0e7963d08b89ef", "parents": [ "deb2a1d29bf0168ff2575e714e5c1f156be663fb", "5259a06ef97068b710f45d092a587e8d740f750f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 15:31:23 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 15:31:23 2014 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nPull SCSI target updates from Nicholas Bellinger:\n \"The highlights this round include:\n\n - add support for SCSI Referrals (Hannes)\n - add support for T10 DIF into target core (nab + mkp)\n - add support for T10 DIF emulation in FILEIO + RAMDISK backends (Sagi + nab)\n - add support for T10 DIF -\u003e bio_integrity passthrough in IBLOCK backend (nab)\n - prep changes to iser-target for \u003e\u003d v3.15 T10 DIF support (Sagi)\n - add support for qla2xxx N_Port ID Virtualization - NPIV (Saurav + Quinn)\n - allow percpu_ida_alloc() to receive task state bitmask (Kent)\n - fix \u003e\u003d v3.12 iscsi-target session reset hung task regression (nab)\n - fix \u003e\u003d v3.13 percpu_ref se_lun-\u003elun_ref_active race (nab)\n - fix a long-standing network portal creation race (Andy)\"\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (51 commits)\n target: Fix percpu_ref_put race in transport_lun_remove_cmd\n target/iscsi: Fix network portal creation race\n target: Report bad sector in sense data for DIF errors\n iscsi-target: Convert gfp_t parameter to task state bitmask\n iscsi-target: Fix connection reset hang with percpu_ida_alloc\n percpu_ida: Make percpu_ida_alloc + callers accept task state bitmask\n iscsi-target: Pre-allocate more tags to avoid ack starvation\n qla2xxx: Configure NPIV fc_vport via tcm_qla2xxx_npiv_make_lport\n qla2xxx: Enhancements to enable NPIV support for QLOGIC ISPs with TCM/LIO.\n qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure\n IB/isert: pass scatterlist instead of cmd to fast_reg_mr routine\n IB/isert: Move fastreg descriptor creation to a function\n IB/isert: Avoid frwr notation, user fastreg\n IB/isert: seperate connection protection domains and dma MRs\n tcm_loop: Enable DIF/DIX modes in SCSI host LLD\n target/rd: Add DIF protection into rd_execute_rw\n target/rd: Add support for protection SGL setup + release\n target/rd: Refactor rd_build_device_space + rd_release_device_space\n target/file: Add DIF protection support to fd_execute_rw\n target/file: Add DIF protection init/format support\n ...\n" }, { "commit": "7c762036e2480bfd43e62ed872b82e372fe92474", "tree": "a8ffc1da857e99b210d65df21209ec027c81a695", "parents": [ "94db37ad85f8711d38744d3a12cae569641a41a3" ], "author": { "name": "Lorenzo Pieralisi", "email": "lorenzo.pieralisi@arm.com", "time": "Mon Jan 27 10:50:37 2014 +0000" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jan 31 15:15:13 2014 -0800" }, "message": "drivers: bus: fix CCI driver kcalloc call parameters swap\n\nThis patch fixes a bug/typo in the CCI driver kcalloc usage\nthat inadvertently swapped the parameters order in the\nkcalloc call and went unnoticed.\n\nReported-by: Xia Feng \u003cxiafeng@allwinnertech.com\u003e\nSigned-off-by: Lorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "167eeb470057adb5e9a22281d2852edc91c70473", "tree": "1cd900f135b5d3c7160f0e18cbd01914d5f7e64d", "parents": [ "3f7c73023f7e317b7704d9c1c80a57bd3cc91828", "19e61d41404fe4094c2d54943dbf883d9bbca864" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jan 31 14:59:28 2014 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jan 31 14:59:28 2014 -0800" }, "message": "Merge tag \u0027mvebu-fixes-3.13-2\u0027 of git://git.infradead.org/linux-mvebu into fixes\n\nmvebu fixes for v3.13 (incremental #2)\n\n - allow building and booting DT and non-DT plat-orion SoCs\n - catch proper return value for kirkwood_pm_init()\n - properly check return of of_iomap to solve boot hangs (mirabox, others)\n - remove a compile warning on Armada 370 with non-SMP.\n\n* tag \u0027mvebu-fixes-3.13-2\u0027 of git://git.infradead.org/linux-mvebu:\n ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)\n ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed\n ARM: kirkwood: kirkwood_pm_init() should return void\n ARM: orion: provide C-style interrupt handler for MULTI_IRQ_HANDLER\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "b399c46ea0070671f3abbe1915d26076101a42f2", "tree": "8945606976fc46c3446c09f8a9e0d4f45f6c408e", "parents": [ "b890eb4ecc718907223a3b7b7b069b59b33f28ef", "6c3df5da67f1f53df78c7e20cd53a481dc28eade" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 09:31:14 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 09:31:14 2014 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media updates from Mauro Carvalho Chehab:\n - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4)\n - a new dvb frontend for ds2103 chipset (m88ds2103)\n - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf)\n - new drivers for R-Car VSP1\n - a new radio driver: radio-raremono\n - a new tuner driver for ts2022 chipset (m88ts2022)\n - the analog part of em28xx is now a separate module that only\n load/runs if the device is not a pure digital TV device\n - added a staging driver for bcm2048 radio devices\n - the omap 2 video driver (omap24xx) was moved to staging. This driver\n is for an old hardware and uses a deprecated Kernel internal API. If\n nobody cares enough to fix it, it would be removed on a couple Kernel\n releases\n - the sn9c102 driver was moved to staging. This driver was replaced by\n gspca, and disabled on some distros, as almost all devices are known\n to work properly with gspca. It should be removed from kernel on a\n couple Kernel releases\n - lots of driver fixes, improvements and cleanups\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (421 commits)\n [media] media: v4l2-dev: fix video device index assignment\n [media] rc-core: reuse device numbers\n [media] em28xx-cards: properly initialize the device bitmap\n [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c\n [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c\n [media] Staging: media: Fix quoted string split across line in as102_fe.c\n [media] media: st-rc: Add reset support\n [media] m2m-deinterlace: fix allocated struct type\n [media] radio-usb-si4713: fix sparse non static symbol warnings\n [media] em28xx-audio: remove needless check before usb_free_coherent()\n [media] au0828: Fix sparse non static symbol warning\n Revert \"[media] go7007-usb: only use go-\u003edev after allocated\"\n [media] em28xx-audio: provide an error code when URB submit fails\n [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting\n [media] em28xx: fix usb alternate setting for analog and digital video endpoints \u003e 0\n [media] em28xx: make \u0027em28xx_ctrl_ops\u0027 static\n em28xx-alsa: Fix error patch for init/fini\n [media] em28xx-audio: flush work at .fini\n [media] drxk: remove the option to load firmware asynchronously\n [media] em28xx: adjust period size at runtime\n ...\n" }, { "commit": "b890eb4ecc718907223a3b7b7b069b59b33f28ef", "tree": "6c97e9a60e402525766073bf2fd8bf62916cf97a", "parents": [ "aafd9d6a46745926648cb5d0b68b108e79ceb8d4", "88ea0f2c02f461613dd67664a79db525e9723609" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 09:23:52 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 09:23:52 2014 -0800" }, "message": "Merge tag \u0027pm+acpi-3.14-rc1-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull ACPI and power management fixes and cleanups from Rafael Wysocki:\n\n - ACPI device hotplug fix preventing ACPI drivers from binding to device\n objects that acpi_bus_trim() has been called for and the devices\n represented by them may not be operational.\n\n - Recent cpufreq changes related to the \"boost\" (turbo) feature broke\n the acpi-cpufreq error code path causing a NULL pointer dereference\n to occur on some systems. Fix from Konrad Rzeszutek Wilk.\n\n - The log level of a CPU initialization error message added recently\n needs to be reduced, because the particular BIOS issue indicated by\n it turns out to be widespread and doesn\u0027t really matter for the\n majority of systems having it. From Jiang Liu.\n\n - The regulator API needs to be told to stay away from things on systems\n with ACPI BIOSes or it may conflict with the BIOS\u0027 own handling of\n voltage regulators. Fix from Mark Brown that works around a 3.13\n regression in lm90 on PCs occuring if the regulator API is enabled.\n\n - Prevent the Exynos4 devfreq driver from being built on multiplatform,\n because it depends on things that aren\u0027t available during such builds.\n From Sachin Kamat.\n\n - Upstream ACPICA doesn\u0027t use the bool type as defined in the kernel,\n so modify the kernel\u0027s ACPICA code to follow the upstream in that\n respect (only one variable definition is affected) to reduce\n divergences between the two. From Lv Zheng.\n\n - Make the ACPI device PM code use ACPI_COMPANION() instead of its own\n routine doing the same thing (and invokng ACPI_COMPANION() in the\n process).\n\n - Modify some routines in the ACPI processor driver to follow the\n common convention and return negative integers on errors. From\n Hanjun Guo.\n\n* tag \u0027pm+acpi-3.14-rc1-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n ACPI / scan: Clear match_driver flag in acpi_bus_trim()\n ACPI / init: Flag use of ACPI and ACPI idioms for power supplies to regulator API\n acpi-cpufreq: De-register CPU notifier and free struct msr on error.\n ACPICA: Remove bool usage from ACPICA.\n PM / devfreq: Disable Exynos4 driver build on multiplatform\n ACPI / PM: Use ACPI_COMPANION() to get ACPI companions of devices\n ACPI / scan: reduce log level of \"ACPI: \\_PR_.CPU4: failed to get CPU APIC ID\"\n ACPI / processor: Return specific error value when mapping lapic id\n" }, { "commit": "14164b46fc994bcf82963ace00372cf808a31af1", "tree": "e2a26a3a42a55bc3d2887cf9793d03843e1fa272", "parents": [ "e2a0f813e0d53014b78aae76f0359c8a41f05eeb", "f93576e1ac34fd7a93d6f3432e71295bbe6a27ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 08:38:18 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 08:38:18 2014 -0800" }, "message": "Merge tag \u0027stable/for-linus-3.14-rc0-late-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip\n\nPull Xen bugfixes from Konrad Rzeszutek Wilk:\n \"Bug-fixes for the new features that were added during this cycle.\n\n There are also two fixes for long-standing issues for which we have a\n solution: grant-table operations extra work that was not needed\n causing performance issues and the self balloon code was too\n aggressive causing OOMs.\n\n Details:\n - Xen ARM couldn\u0027t use the new FIFO events\n - Xen ARM couldn\u0027t use the SWIOTLB if compiled as 32-bit with 64-bit PCIe devices.\n - Grant table were doing needless M2P operations.\n - Ratchet down the self-balloon code so it won\u0027t OOM.\n - Fix misplaced kfree in Xen PVH error code paths\"\n\n* tag \u0027stable/for-linus-3.14-rc0-late-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:\n xen/pvh: Fix misplaced kfree from xlated_setup_gnttab_pages\n drivers: xen: deaggressive selfballoon driver\n xen/grant-table: Avoid m2p_override during mapping\n xen/gnttab: Use phys_addr_t to describe the grant frame base address\n xen: swiotlb: handle sizeof(dma_addr_t) !\u003d sizeof(phys_addr_t)\n arm/xen: Initialize event channels earlier\n" }, { "commit": "e2a0f813e0d53014b78aae76f0359c8a41f05eeb", "tree": "08cbd30d7e407e8d1009338aeda56e895afb6d9d", "parents": [ "e30b82bbe098d9514ed0e9b5ec372daf7429e0f7", "b73117c49364551ff789db7c424a115ac5b77850" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 08:37:32 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 31 08:37:32 2014 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull more KVM updates from Paolo Bonzini:\n \"Second batch of KVM updates. Some minor x86 fixes, two s390 guest\n features that need some handling in the host, and all the PPC changes.\n\n The PPC changes include support for little-endian guests and\n enablement for new POWER8 features\"\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (45 commits)\n x86, kvm: correctly access the KVM_CPUID_FEATURES leaf at 0x40000101\n x86, kvm: cache the base of the KVM cpuid leaves\n kvm: x86: move KVM_CAP_HYPERV_TIME outside #ifdef\n KVM: PPC: Book3S PR: Cope with doorbell interrupts\n KVM: PPC: Book3S HV: Add software abort codes for transactional memory\n KVM: PPC: Book3S HV: Add new state for transactional memory\n powerpc/Kconfig: Make TM select VSX and VMX\n KVM: PPC: Book3S HV: Basic little-endian guest support\n KVM: PPC: Book3S HV: Add support for DABRX register on POWER7\n KVM: PPC: Book3S HV: Prepare for host using hypervisor doorbells\n KVM: PPC: Book3S HV: Handle new LPCR bits on POWER8\n KVM: PPC: Book3S HV: Handle guest using doorbells for IPIs\n KVM: PPC: Book3S HV: Consolidate code that checks reason for wake from nap\n KVM: PPC: Book3S HV: Implement architecture compatibility modes for POWER8\n KVM: PPC: Book3S HV: Add handler for HV facility unavailable\n KVM: PPC: Book3S HV: Flush the correct number of TLB sets on POWER8\n KVM: PPC: Book3S HV: Context-switch new POWER8 SPRs\n KVM: PPC: Book3S HV: Align physical and virtual CPU thread numbers\n KVM: PPC: Book3S HV: Don\u0027t set DABR on POWER8\n kvm/ppc: IRQ disabling cleanup\n ...\n" }, { "commit": "bc1b0df59e3fc4573f92bc1aab9652047a0aeaa7", "tree": "53cc9ed64066763826df51f914556c9f88a2a864", "parents": [ "08ece5bb2312b4510b161a6ef6682f37f4eac8a1" ], "author": { "name": "Bob Liu", "email": "lliubbo@gmail.com", "time": "Wed Jan 22 14:57:44 2014 +0800" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Jan 31 09:48:43 2014 -0500" }, "message": "drivers: xen: deaggressive selfballoon driver\n\nCurrent xen-selfballoon driver is too aggressive which may cause OOM be\ntriggered more often. Eg. this bug reported by James:\nhttps://lkml.org/lkml/2013/11/21/158\n\nThere are two mainly reasons:\n1) The original goal_page didn\u0027t consider some pages used by kernel space, like\nslab pages and pages used by device drivers.\n\n2) The balloon driver may not give back memory to guest OS fast enough when the\nworkload suddenly aquries a lot of physical memory.\n\nIn both cases, the guest OS will suffer from memory pressure and OOM may\nbe triggered.\n\nThe fix is make xen-selfballoon driver not that aggressive by adding extra 10%\nof total ram pages to goal_page.\nIt\u0027s more valuable to keep the guest system reliable and response faster than\nballoon out these 10% pages to XEN.\n\nSigned-off-by: Bob Liu \u003cbob.liu@oracle.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "08ece5bb2312b4510b161a6ef6682f37f4eac8a1", "tree": "d331f6b82ca8f0346afdf54bc793fb10c4bdaec8", "parents": [ "47c542050d306e50f09512eb6339dbf2fc02fddd" ], "author": { "name": "Zoltan Kiss", "email": "zoltan.kiss@citrix.com", "time": "Thu Jan 23 21:23:44 2014 +0000" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Jan 31 09:48:32 2014 -0500" }, "message": "xen/grant-table: Avoid m2p_override during mapping\n\nThe grant mapping API does m2p_override unnecessarily: only gntdev needs it,\nfor blkback and future netback patches it just cause a lock contention, as\nthose pages never go to userspace. Therefore this series does the following:\n- the original functions were renamed to __gnttab_[un]map_refs, with a new\n parameter m2p_override\n- based on m2p_override either they follow the original behaviour, or just set\n the private flag and call set_phys_to_machine\n- gnttab_[un]map_refs are now a wrapper to call __gnttab_[un]map_refs with\n m2p_override false\n- a new function gnttab_[un]map_refs_userspace provides the old behaviour\n\nIt also removes a stray space from page.h and change ret to 0 if\nXENFEAT_auto_translated_physmap, as that is the only possible return value\nthere.\n\nv2:\n- move the storing of the old mfn in page-\u003eindex to gnttab_map_refs\n- move the function header update to a separate patch\n\nv3:\n- a new approach to retain old behaviour where it needed\n- squash the patches into one\n\nv4:\n- move out the common bits from m2p* functions, and pass pfn/mfn as parameter\n- clear page-\u003eprivate before doing anything with the page, so m2p_find_override\n won\u0027t race with this\n\nv5:\n- change return value handling in __gnttab_[un]map_refs\n- remove a stray space in page.h\n- add detail why ret \u003d 0 now at some places\n\nv6:\n- don\u0027t pass pfn to m2p* functions, just get it locally\n\nSigned-off-by: Zoltan Kiss \u003czoltan.kiss@citrix.com\u003e\nSuggested-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nAcked-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nAcked-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2", "tree": "f36d3ccd0fa20f98c694c09ab9b07ec3db0a00f6", "parents": [ "271bf66d4c0c8db29764d241e4e46883d9c0a198", "2c7ca5cc3624e05a5235f70039adce30725972d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 20:04:09 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 20:04:09 2014 -0800" }, "message": "Merge tag \u0027upstream-3.14-rc1\u0027 of git://git.infradead.org/linux-ubifs\n\nPull ubifs updates from Artem Bityutskiy:\n\n - Improve the NOR erasure quirk - now it tries to do as little writes\n as possible, because the eraseblock may be in an \"unstable\" state and\n write operation sometimes causes NOR chip lock-ups.\n\n - Both UBI and UBIFS changes are now maintainer in one single tree,\n because the amount of changes dropped significantly.\n\n* tag \u0027upstream-3.14-rc1\u0027 of git://git.infradead.org/linux-ubifs:\n UBI: avoid program operation on NOR flash after erasure interrupted\n MAINTAINERS: keep UBI and UBIFS stuff in the same tree\n UBI: fix error return code\n" }, { "commit": "aa2e7100e38880db7907cb2b7ec6267b2b243771", "tree": "67f9d2479365398c07833d3fc4f794861f7da5b1", "parents": [ "2def2ef2ae5f3990aabdbe8a755911902707d268", "7c094fd698de2f333fa39b6da213f880d40b9bfe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 18:44:44 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 18:44:44 2014 -0800" }, "message": "Merge branch \u0027akpm\u0027 (patches from Andrew Morton)\n\nMerge misc fixes from Andrew Morton:\n \"A few hotfixes and various leftovers which were awaiting other merges.\n\n Mainly movement of zram into mm/\"\n\n* emailed patches fron Andrew Morton \u003cakpm@linux-foundation.org\u003e: (25 commits)\n memcg: fix mutex not unlocked on memcg_create_kmem_cache fail path\n Documentation/filesystems/vfs.txt: update file_operations documentation\n mm, oom: base root bonus on current usage\n mm: don\u0027t lose the SOFT_DIRTY flag on mprotect\n mm/slub.c: fix page-\u003e_count corruption (again)\n mm/mempolicy.c: fix mempolicy printing in numa_maps\n zram: remove zram-\u003elock in read path and change it with mutex\n zram: remove workqueue for freeing removed pending slot\n zram: introduce zram-\u003etb_lock\n zram: use atomic operation for stat\n zram: remove unnecessary free\n zram: delay pending free request in read path\n zram: fix race between reset and flushing pending work\n zsmalloc: add maintainers\n zram: add zram maintainers\n zsmalloc: add copyright\n zram: add copyright\n zram: remove old private project comment\n zram: promote zram from staging\n zsmalloc: move it under mm\n ...\n" }, { "commit": "cdfc83075fb76369a31e6c187d0cebcab9f8b9c8", "tree": "33d1cdca3e2cb610451ed30943189f55652bac4c", "parents": [ "04a24ae45d018e177db7e4ae2d03a70f79149782", "b26a21c1eacdb7daf22a304fa857413df2650cfe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 17:20:32 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 17:20:32 2014 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS updates from Ralf Baechle:\n \"The most notable new addition inside this pull request is the support\n for MIPS\u0027s latest and greatest core called \"inter/proAptiv\". The\n patch series describes this core as follows.\n\n \"The interAptiv is a power-efficient multi-core microprocessor\n for use in system-on-chip (SoC) applications. The interAptiv combines\n a multi-threading pipeline with a coherence manager to deliver improved\n computational throughput and power efficiency. The interAptiv can\n contain one to four MIPS32R3 interAptiv cores, system level\n coherence manager with L2 cache, optional coherent I/O port,\n and optional floating point unit.\"\n\n The platform specific patches touch all 3 Broadcom families. It adds\n support for the new Broadcom/Netlogix XLP9xx Soc, building a common\n BCM63XX SMP kernel for all BCM63XX SoCs regardless of core type/count\n and full gpio button/led descriptions for BCM47xx.\n\n The rest of the series are cleanups and bug fixes that are MIPS\n generic and consist largely of changes that Imgtec/MIPS had published\n in their linux-mti-3.10.git stable tree. Random other cleanups and\n patches preparing code to be merged in 3.15\"\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits)\n mips: select ARCH_MIGHT_HAVE_PC_SERIO\n mips: delete non-required instances of include \u003clinux/init.h\u003e\n MIPS: KVM: remove shadow_tlb code\n MIPS: KVM: use common EHINV aware UNIQUE_ENTRYHI\n mips/ide: flush dcache also if icache does not snoop dcache\n MIPS: BCM47XX: fix position of cpu_wait disabling\n MIPS: BCM63XX: select correct MIPS_L1_CACHE_SHIFT value\n MIPS: update MIPS_L1_CACHE_SHIFT based on MIPS_L1_CACHE_SHIFT_\u003cN\u003e\n MIPS: introduce MIPS_L1_CACHE_SHIFT_\u003cN\u003e\n MIPS: ZBOOT: gather string functions into string.c\n arch/mips/pci: don\u0027t check resource with devm_ioremap_resource\n arch/mips/lantiq/xway: don\u0027t check resource with devm_ioremap_resource\n bcma: gpio: don\u0027t cast u32 to unsigned long\n ssb: gpio: add own IRQ domain\n MIPS: BCM47XX: fix sparse warnings in board.c\n MIPS: BCM47XX: add board detection for Linksys WRT54GS V1\n MIPS: BCM47XX: fix detection for some boards\n MIPS: BCM47XX: Enable buttons support on SSB\n MIPS: BCM47XX: Convert WNDR4500 to new syntax\n MIPS: BCM47XX: Use \"timer\" trigger for status LEDs\n ...\n" }, { "commit": "4bcec913d0a98d991c750034a04675443d1f10b5", "tree": "ce2e960ba26d50f09b6a7bd864b2b4d3c275e69b", "parents": [ "03c7287dd22c18815964219c9a2e75054cd004df", "f878f84373aefda7f041a74b24a83b8b7dec1cf0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 17:07:18 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 17:07:18 2014 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull more powerpc bits from Ben Herrenschmidt:\n \"Here are a few more powerpc bits for this merge window. The bulk is\n made of two pull requests from Scott and Anatolij that I had missed\n previously (they arrived while I was away). Since both their branches\n are in -next independently, and the content has been around for a\n little while, they can still go in.\n\n The rest is mostly bug and regression fixes, a small series of\n cleanups to our pseries cpuidle code (including moving it to the right\n place), and one new cpuidle bakend for the powernv platform. I also\n wired up the new sched_attr syscalls\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (37 commits)\n powerpc: Wire up sched_setattr and sched_getattr syscalls\n powerpc/hugetlb: Replace __get_cpu_var with get_cpu_var\n powerpc: Make sure \"cache\" directory is removed when offlining cpu\n powerpc/mm: Fix mmap errno when MAP_FIXED is set and mapping exceeds the allowed address space\n powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.\n powerpc/pseries/cpuidle: smt-snooze-delay cleanup.\n powerpc/pseries/cpuidle: Remove MAX_IDLE_STATE macro.\n powerpc/pseries/cpuidle: Make cpuidle-pseries backend driver a non-module.\n powerpc/pseries/cpuidle: Use cpuidle_register() for initialisation.\n powerpc/pseries/cpuidle: Move processor_idle.c to drivers/cpuidle.\n powerpc: Fix 32-bit frames for signals delivered when transactional\n powerpc/iommu: Fix initialisation of DART iommu table\n powerpc/numa: Fix decimal permissions\n powerpc/mm: Fix compile error of pgtable-ppc64.h\n powerpc: Fix hw breakpoints on !HAVE_HW_BREAKPOINT configurations\n clk: corenet: Adds the clock binding\n powerpc/booke64: Guard e6500 tlb handler with CONFIG_PPC_FSL_BOOK3E\n powerpc/512x: dts: add MPC5125 clock specs\n powerpc/512x: clk: support MPC5121/5123/5125 SoC variants\n powerpc/512x: clk: enforce even SDHC divider values\n ...\n" }, { "commit": "e46e33152eb82b8e2db7ffb3790a2a2653c34513", "tree": "a55cd8329dcb0f30b11ff75605b3f4f7bbd790de", "parents": [ "f614a9f48dedd2b80d1dc8bae8094842fcdb39dd" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:46:06 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:56 2014 -0800" }, "message": "zram: remove zram-\u003elock in read path and change it with mutex\n\nFinally, we separated zram-\u003elock dependency from 32bit stat/ table\nhandling so there is no reason to use rw_semaphore between read and\nwrite path so this patch removes the lock from read path totally and\nchanges rw_semaphore with mutex. So, we could do\n\nold:\n\n read-read: OK\n read-write: NO\n write-write: NO\n\nNow:\n\n read-read: OK\n read-write: OK\n write-write: NO\n\nThe below data proves mixed workload performs well 11 times and there is\nalso enhance on write-write path because current rw-semaphore doesn\u0027t\nsupport SPIN_ON_OWNER. It\u0027s side effect but anyway good thing for us.\n\nWrite-related tests perform better (from 61% to 1058%) but read path has\ngood/bad(from -2.22% to 1.45%) but they are all marginal within stddev.\n\n CPU 12\n iozone -t -T -l 12 -u 12 -r 16K -s 60M -I +Z -V 0\n\n \u003d\u003dInitial write \u003d\u003dInitial write\n records: 10 records: 10\n avg: 516189.16 avg: 839907.96\n std: 22486.53 (4.36%) std: 47902.17 (5.70%)\n max: 546970.60 max: 909910.35\n min: 481131.54 min: 751148.38\n \u003d\u003dRewrite \u003d\u003dRewrite\n records: 10 records: 10\n avg: 509527.98 avg: 1050156.37\n std: 45799.94 (8.99%) std: 40695.44 (3.88%)\n max: 611574.27 max: 1111929.26\n min: 443679.95 min: 980409.62\n \u003d\u003dRead \u003d\u003dRead\n records: 10 records: 10\n avg: 4408624.17 avg: 4472546.76\n std: 281152.61 (6.38%) std: 163662.78 (3.66%)\n max: 4867888.66 max: 4727351.03\n min: 4058347.69 min: 4126520.88\n \u003d\u003dRe-read \u003d\u003dRe-read\n records: 10 records: 10\n avg: 4462147.53 avg: 4363257.75\n std: 283546.11 (6.35%) std: 247292.63 (5.67%)\n max: 4912894.44 max: 4677241.75\n min: 4131386.50 min: 4035235.84\n \u003d\u003dReverse Read \u003d\u003dReverse Read\n records: 10 records: 10\n avg: 4565865.97 avg: 4485818.08\n std: 313395.63 (6.86%) std: 248470.10 (5.54%)\n max: 5232749.16 max: 4789749.94\n min: 4185809.62 min: 3963081.34\n \u003d\u003dStride read \u003d\u003dStride read\n records: 10 records: 10\n avg: 4515981.80 avg: 4418806.01\n std: 211192.32 (4.68%) std: 212837.97 (4.82%)\n max: 4889287.28 max: 4686967.22\n min: 4210362.00 min: 4083041.84\n \u003d\u003dRandom read \u003d\u003dRandom read\n records: 10 records: 10\n avg: 4410525.23 avg: 4387093.18\n std: 236693.22 (5.37%) std: 235285.23 (5.36%)\n max: 4713698.47 max: 4669760.62\n min: 4057163.62 min: 3952002.16\n \u003d\u003dMixed workload \u003d\u003dMixed workload\n records: 10 records: 10\n avg: 243234.25 avg: 2818677.27\n std: 28505.07 (11.72%) std: 195569.70 (6.94%)\n max: 288905.23 max: 3126478.11\n min: 212473.16 min: 2484150.69\n \u003d\u003dRandom write \u003d\u003dRandom write\n records: 10 records: 10\n avg: 555887.07 avg: 1053057.79\n std: 70841.98 (12.74%) std: 35195.36 (3.34%)\n max: 683188.28 max: 1096125.73\n min: 437299.57 min: 992481.93\n \u003d\u003dPwrite \u003d\u003dPwrite\n records: 10 records: 10\n avg: 501745.93 avg: 810363.09\n std: 16373.54 (3.26%) std: 19245.01 (2.37%)\n max: 518724.52 max: 833359.70\n min: 464208.73 min: 765501.87\n \u003d\u003dPread \u003d\u003dPread\n records: 10 records: 10\n avg: 4539894.60 avg: 4457680.58\n std: 197094.66 (4.34%) std: 188965.60 (4.24%)\n max: 4877170.38 max: 4689905.53\n min: 4226326.03 min: 4095739.72\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f614a9f48dedd2b80d1dc8bae8094842fcdb39dd", "tree": "411b14762df0f6ad7261b5d6f6ad7c9bc28a2204", "parents": [ "92967471b67163bb1654e9b7fe99449ab70a4aaa" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:46:04 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: remove workqueue for freeing removed pending slot\n\nCommit a0c516cbfc74 (\"zram: don\u0027t grab mutex in zram_slot_free_noity\")\nintroduced free request pending code to avoid scheduling by mutex under\nspinlock and it was a mess which made code lenghty and increased\noverhead.\n\nNow, we don\u0027t need zram-\u003elock any more to free slot so this patch\nreverts it and then, tb_lock should protect it.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "92967471b67163bb1654e9b7fe99449ab70a4aaa", "tree": "440e10b86af31f9752585f2472a382d0b36611d4", "parents": [ "deb0bdeb2f3d6b81d37fc778316dae46b6daab56" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:46:03 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: introduce zram-\u003etb_lock\n\nCurrently, the zram table is protected by zram-\u003elock but it\u0027s rather\ncoarse-grained lock and it makes hard for scalibility.\n\nLet\u0027s use own rwlock instead of depending on zram-\u003elock. This patch\nadds new locking so obviously, it would make slow but this patch is just\nprepartion for removing coarse-grained rw_semaphore(ie, zram-\u003elock)\nwhich is hurdle about zram scalability.\n\nFinal patch in this patchset series will remove the lock from read-path\nand change rw_semaphore with mutex in write path. With bonus, we could\ndrop pending slot free mess in next patch.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "deb0bdeb2f3d6b81d37fc778316dae46b6daab56", "tree": "f191670e9a1740af77adc01a46ec859f9c7a2338", "parents": [ "874e3cddc33f0c0f9cc08ad2b73fa0cbe7dfaa63" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:46:02 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: use atomic operation for stat\n\nSome of fields in zram-\u003estats are protected by zram-\u003elock which is\nrather coarse-grained so let\u0027s use atomic operation without explict\nlocking.\n\nThis patch is ready for removing dependency of zram-\u003elock in read path\nwhich is very coarse-grained rw_semaphore. Of course, this patch adds\nnew atomic operation so it might make slow but my 12CPU test couldn\u0027t\nspot any regression. All gain/lose is marginal within stddev.\n\n iozone -t -T -l 12 -u 12 -r 16K -s 60M -I +Z -V 0\n\n \u003d\u003dInitial write \u003d\u003dInitial write\n records: 50 records: 50\n avg: 412875.17 avg: 415638.23\n std: 38543.12 (9.34%) std: 36601.11 (8.81%)\n max: 521262.03 max: 502976.72\n min: 343263.13 min: 351389.12\n \u003d\u003dRewrite \u003d\u003dRewrite\n records: 50 records: 50\n avg: 416640.34 avg: 397914.33\n std: 60798.92 (14.59%) std: 46150.42 (11.60%)\n max: 543057.07 max: 522669.17\n min: 304071.67 min: 316588.77\n \u003d\u003dRead \u003d\u003dRead\n records: 50 records: 50\n avg: 4147338.63 avg: 4070736.51\n std: 179333.25 (4.32%) std: 223499.89 (5.49%)\n max: 4459295.28 max: 4539514.44\n min: 3753057.53 min: 3444686.31\n \u003d\u003dRe-read \u003d\u003dRe-read\n records: 50 records: 50\n avg: 4096706.71 avg: 4117218.57\n std: 229735.04 (5.61%) std: 171676.25 (4.17%)\n max: 4430012.09 max: 4459263.94\n min: 2987217.80 min: 3666904.28\n \u003d\u003dReverse Read \u003d\u003dReverse Read\n records: 50 records: 50\n avg: 4062763.83 avg: 4078508.32\n std: 186208.46 (4.58%) std: 172684.34 (4.23%)\n max: 4401358.78 max: 4424757.22\n min: 3381625.00 min: 3679359.94\n \u003d\u003dStride read \u003d\u003dStride read\n records: 50 records: 50\n avg: 4094933.49 avg: 4082170.22\n std: 185710.52 (4.54%) std: 196346.68 (4.81%)\n max: 4478241.25 max: 4460060.97\n min: 3732593.23 min: 3584125.78\n \u003d\u003dRandom read \u003d\u003dRandom read\n records: 50 records: 50\n avg: 4031070.04 avg: 4074847.49\n std: 192065.51 (4.76%) std: 206911.33 (5.08%)\n max: 4356931.16 max: 4399442.56\n min: 3481619.62 min: 3548372.44\n \u003d\u003dMixed workload \u003d\u003dMixed workload\n records: 50 records: 50\n avg: 149925.73 avg: 149675.54\n std: 7701.26 (5.14%) std: 6902.09 (4.61%)\n max: 191301.56 max: 175162.05\n min: 133566.28 min: 137762.87\n \u003d\u003dRandom write \u003d\u003dRandom write\n records: 50 records: 50\n avg: 404050.11 avg: 393021.47\n std: 58887.57 (14.57%) std: 42813.70 (10.89%)\n max: 601798.09 max: 524533.43\n min: 325176.99 min: 313255.34\n \u003d\u003dPwrite \u003d\u003dPwrite\n records: 50 records: 50\n avg: 411217.70 avg: 411237.96\n std: 43114.99 (10.48%) std: 33136.29 (8.06%)\n max: 530766.79 max: 471899.76\n min: 320786.84 min: 317906.94\n \u003d\u003dPread \u003d\u003dPread\n records: 50 records: 50\n avg: 4154908.65 avg: 4087121.92\n std: 151272.08 (3.64%) std: 219505.04 (5.37%)\n max: 4459478.12 max: 4435857.38\n min: 3730512.41 min: 3101101.67\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "874e3cddc33f0c0f9cc08ad2b73fa0cbe7dfaa63", "tree": "fe3e17b75de97c458a254fc6fc1df16587ea71ae", "parents": [ "9b353db16d18f87242337e3e61a948c023505a65" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:46:01 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: remove unnecessary free\n\nCommit a0c516cbfc74 (\"zram: don\u0027t grab mutex in zram_slot_free_noity\")\nintroduced pending zram slot free in zram\u0027s write path in case of\nmissing slot free by memory allocation failure in zram_slot_free_notify\nbut it is not necessary because we have already freed the slot right\nbefore overwriting.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@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": "9b353db16d18f87242337e3e61a948c023505a65", "tree": "ea24f4859c670b58f416ad423d70343f3aeb752f", "parents": [ "da4a04126baa3be03bc566d4a2ee0944c5e783d0" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:46:00 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: delay pending free request in read path\n\nSergey reported we don\u0027t need to handle pending free request every I/O\nso that this patch removes it in read path while we remain it in write\npath.\n\nLet\u0027s consider below example.\n\nSwap subsystem ask to zram \"A\" block free by swap_slot_free_notify but\nzram had been pended it without real freeing. Swap subsystem allocates\n\"A\" block for new data but request pended for a long time just handled\nand zram blindly free new data on the \"A\" block. :(\n\nThat\u0027s why we couldn\u0027t remove handle pending free request right before\nzram-write.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nReported-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "da4a04126baa3be03bc566d4a2ee0944c5e783d0", "tree": "fec417b4bf836105091c4f32c481442c50cabefb", "parents": [ "eae70d06846199afc97524ed986b910836c0abe5" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:45:58 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: fix race between reset and flushing pending work\n\nDan and Sergey reported that there is a racy between reset and flushing\nof pending work so that it could make oops by freeing zram-\u003emeta in\nreset while zram_slot_free can access zram-\u003emeta if new request is\nadding during the race window.\n\nThis patch moves flush after taking init_lock so it prevents new request\nso that it closes the race.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nTested-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7bfb3de8a1b3bebc2dc68d381efe27448c0584c5", "tree": "d144e27202f130dca0bfe6477d152d87a1be3a54", "parents": [ "49061236a9c2e18b31617cef10d27ba136068bac" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:45:55 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: add copyright\n\nAdd my copyright to the zram source code which I maintain.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "49061236a9c2e18b31617cef10d27ba136068bac", "tree": "0529b786345bb01db3caf360c7465866be17932f", "parents": [ "cd67e10ac6997c6d1e1504e3c111b693bfdbc148" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:45:54 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: remove old private project comment\n\nRemove the old private compcache project address so upcoming patches\nshould be sent to LKML because we Linux kernel community will take care.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd67e10ac6997c6d1e1504e3c111b693bfdbc148", "tree": "a37521eff62f7e7e86ab94be44f02aca4c6a0abb", "parents": [ "bcf1647d0899666f0fb90d176abf63bae22abb7c" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:45:52 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zram: promote zram from staging\n\nZram has lived in staging for a LONG LONG time and have been\nfixed/improved by many contributors so code is clean and stable now. Of\ncourse, there are lots of product using zram in real practice.\n\nThe major TV companys have used zram as swap since two years ago and\nrecently our production team released android smart phone with zram\nwhich is used as swap, too and recently Android Kitkat start to use zram\nfor small memory smart phone. And there was a report Google released\ntheir ChromeOS with zram, too and cyanogenmod have been used zram long\ntime ago. And I heard some disto have used zram block device for tmpfs.\nIn addition, I saw many report from many other peoples. For example,\nLubuntu start to use it.\n\nThe benefit of zram is very clear. With my experience, one of the\nbenefit was to remove jitter of video application with backgroud memory\npressure. It would be effect of efficient memory usage by compression\nbut more issue is whether swap is there or not in the system. Recent\nmobile platforms have used JAVA so there are many anonymous pages. But\nembedded system normally are reluctant to use eMMC or SDCard as swap\nbecause there is wear-leveling and latency issues so if we do not use\nswap, it means we can\u0027t reclaim anoymous pages and at last, we could\nencounter OOM kill. :(\n\nAlthough we have real storage as swap, it was a problem, too. Because\nit sometime ends up making system very unresponsible caused by slow swap\nstorage performance.\n\nQuote from Luigi on Google\n \"Since Chrome OS was mentioned: the main reason why we don\u0027t use swap\n to a disk (rotating or SSD) is because it doesn\u0027t degrade gracefully\n and leads to a bad interactive experience. Generally we prefer to\n manage RAM at a higher level, by transparently killing and restarting\n processes. But we noticed that zram is fast enough to be competitive\n with the latter, and it lets us make more efficient use of the\n available RAM. \" and he announced.\nhttp://www.spinics.net/lists/linux-mm/msg57717.html\n\nOther uses case is to use zram for block device. Zram is block device\nso anyone can format the block device and mount on it so some guys on\nthe internet start zram as /var/tmp.\nhttp://forums.gentoo.org/viewtopic-t-838198-start-0.html\n\nLet\u0027s promote zram and enhance/maintain it instead of removing.\n\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nAcked-by: Nitin Gupta \u003cngupta@vflare.org\u003e\nAcked-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Bob Liu \u003cbob.liu@oracle.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Luigi Semenzato \u003csemenzato@google.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Seth Jennings \u003csjenning@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bcf1647d0899666f0fb90d176abf63bae22abb7c", "tree": "6682b0feec718f594829770b4287afa2da266a0f", "parents": [ "73f945505b9bf798d8c3ee830cb330dd6d7fb4c7" ], "author": { "name": "Minchan Kim", "email": "minchan@kernel.org", "time": "Thu Jan 30 15:45:50 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:55 2014 -0800" }, "message": "zsmalloc: move it under mm\n\nThis patch moves zsmalloc under mm directory.\n\nBefore that, description will explain why we have needed custom\nallocator.\n\nZsmalloc is a new slab-based memory allocator for storing compressed\npages. It is designed for low fragmentation and high allocation success\nrate on large object, but \u003c\u003d PAGE_SIZE allocations.\n\nzsmalloc differs from the kernel slab allocator in two primary ways to\nachieve these design goals.\n\nzsmalloc never requires high order page allocations to back slabs, or\n\"size classes\" in zsmalloc terms. Instead it allows multiple\nsingle-order pages to be stitched together into a \"zspage\" which backs\nthe slab. This allows for higher allocation success rate under memory\npressure.\n\nAlso, zsmalloc allows objects to span page boundaries within the zspage.\nThis allows for lower fragmentation than could be had with the kernel\nslab allocator for objects between PAGE_SIZE/2 and PAGE_SIZE. With the\nkernel slab allocator, if a page compresses to 60% of it original size,\nthe memory savings gained through compression is lost in fragmentation\nbecause another object of the same size can\u0027t be stored in the leftover\nspace.\n\nThis ability to span pages results in zsmalloc allocations not being\ndirectly addressable by the user. The user is given an\nnon-dereferencable handle in response to an allocation request. That\nhandle must be mapped, using zs_map_object(), which returns a pointer to\nthe mapped region that can be used. The mapping is necessary since the\nobject data may reside in two different noncontigious pages.\n\nThe zsmalloc fulfills the allocation needs for zram perfectly\n\n[sjenning@linux.vnet.ibm.com: borrow Seth\u0027s quote]\nSigned-off-by: Minchan Kim \u003cminchan@kernel.org\u003e\nAcked-by: Nitin Gupta \u003cngupta@vflare.org\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Bob Liu \u003cbob.liu@oracle.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Luigi Semenzato \u003csemenzato@google.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Seth Jennings \u003csjenning@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0c692d07842a67d9aa6b8266a80e4ac460a5c1a2", "tree": "8ecdf75687efe387fd47feec6df5b88b5cc48bc0", "parents": [ "54f5968db9e09de8779b5a5174719af51f1da199" ], "author": { "name": "Levente Kurusa", "email": "levex@linux.com", "time": "Thu Jan 30 15:45:46 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:54 2014 -0800" }, "message": "drivers/net/phy/mdio_bus.c: call put_device on device_register() failure\n\nIt is required to call put_device() if device_register() fails, so that\nwe give up the last reference to the device. Calling put_device allows\nfor mdiobus_release to be executed, kfreeing the bus.\n\nSigned-off-by: Levente Kurusa \u003clevex@linux.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "54f5968db9e09de8779b5a5174719af51f1da199", "tree": "a457a3af2a40fcf184bcfca10123c175ddc3eaf4", "parents": [ "07bacb3826d613bb651297a201dd2df8dd4fdee5" ], "author": { "name": "Levente Kurusa", "email": "levex@linux.com", "time": "Thu Jan 30 15:45:45 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 16:56:54 2014 -0800" }, "message": "drivers/video/backlight/lcd.c: call put_device if device_register fails\n\nCurrently we kfree the container of the device which failed to register.\nThis is wrong as the last reference is not given up with a put_device\ncall. Also, now that we have put_device() callen, we no longer need the\nkfree as the new_ld-\u003edev.release function will take care of kfreeing the\nassociated memory.\n\nSigned-off-by: Levente Kurusa \u003clevex@linux.com\u003e\nAcked-by: Jingoo Han \u003cjg1.han@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "53d8ab29f8f6d67e37857b68189b38fa3d87dd8e", "tree": "3c770b58f0404c67b1b084f626dcafa8464c7512", "parents": [ "f568849edac8611d603e00bd6cbbcfea09395ae6", "14424be4dbfa127001ad623869f7ee4c7635e991" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 11:40:10 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 11:40:10 2014 -0800" }, "message": "Merge branch \u0027for-3.14/drivers\u0027 of git://git.kernel.dk/linux-block\n\nPull block IO driver changes from Jens Axboe:\n\n - bcache update from Kent Overstreet.\n\n - two bcache fixes from Nicholas Swenson.\n\n - cciss pci init error fix from Andrew.\n\n - underflow fix in the parallel IDE pg_write code from Dan Carpenter.\n I\u0027m sure the 1 (or 0) users of that are now happy.\n\n - two PCI related fixes for sx8 from Jingoo Han.\n\n - floppy init fix for first block read from Jiri Kosina.\n\n - pktcdvd error return miss fix from Julia Lawall.\n\n - removal of IRQF_SHARED from the SEGA Dreamcast CD-ROM code from\n Michael Opdenacker.\n\n - comment typo fix for the loop driver from Olaf Hering.\n\n - potential oops fix for null_blk from Raghavendra K T.\n\n - two fixes from Sam Bradshaw (Micron) for the mtip32xx driver, fixing\n an OOM problem and a problem with handling security locked conditions\n\n* \u0027for-3.14/drivers\u0027 of git://git.kernel.dk/linux-block: (47 commits)\n mg_disk: Spelling s/finised/finished/\n null_blk: Null pointer deference problem in alloc_page_buffers\n mtip32xx: Correctly handle security locked condition\n mtip32xx: Make SGL container per-command to eliminate high order dma allocation\n drivers/block/loop.c: fix comment typo in loop_config_discard\n drivers/block/cciss.c:cciss_init_one(): use proper errnos\n drivers/block/paride/pg.c: underflow bug in pg_write()\n drivers/block/sx8.c: remove unnecessary pci_set_drvdata()\n drivers/block/sx8.c: use module_pci_driver()\n floppy: bail out in open() if drive is not responding to block0 read\n bcache: Fix auxiliary search trees for key size \u003e cacheline size\n bcache: Don\u0027t return -EINTR when insert finished\n bcache: Improve bucket_prio() calculation\n bcache: Add bch_bkey_equal_header()\n bcache: update bch_bkey_try_merge\n bcache: Move insert_fixup() to btree_keys_ops\n bcache: Convert sorting to btree_keys\n bcache: Convert debug code to btree_keys\n bcache: Convert btree_iter to struct btree_keys\n bcache: Refactor bset_tree sysfs stats\n ...\n" }, { "commit": "f568849edac8611d603e00bd6cbbcfea09395ae6", "tree": "b9472d640fe5d87426d38c9d81d946cf197ad3fb", "parents": [ "d9894c228b11273e720bb63ba120d1d326fe9d94", "675675ada486dde5bf9aa51665e90706bff11a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 11:19:05 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 11:19:05 2014 -0800" }, "message": "Merge branch \u0027for-3.14/core\u0027 of git://git.kernel.dk/linux-block\n\nPull core block IO changes from Jens Axboe:\n \"The major piece in here is the immutable bio_ve series from Kent, the\n rest is fairly minor. It was supposed to go in last round, but\n various issues pushed it to this release instead. The pull request\n contains:\n\n - Various smaller blk-mq fixes from different folks. Nothing major\n here, just minor fixes and cleanups.\n\n - Fix for a memory leak in the error path in the block ioctl code\n from Christian Engelmayer.\n\n - Header export fix from CaiZhiyong.\n\n - Finally the immutable biovec changes from Kent Overstreet. This\n enables some nice future work on making arbitrarily sized bios\n possible, and splitting more efficient. Related fixes to immutable\n bio_vecs:\n\n - dm-cache immutable fixup from Mike Snitzer.\n - btrfs immutable fixup from Muthu Kumar.\n\n - bio-integrity fix from Nic Bellinger, which is also going to stable\"\n\n* \u0027for-3.14/core\u0027 of git://git.kernel.dk/linux-block: (44 commits)\n xtensa: fixup simdisk driver to work with immutable bio_vecs\n block/blk-mq-cpu.c: use hotcpu_notifier()\n blk-mq: for_each_* macro correctness\n block: Fix memory leak in rw_copy_check_uvector() handling\n bio-integrity: Fix bio_integrity_verify segment start bug\n block: remove unrelated header files and export symbol\n blk-mq: uses page-\u003elist incorrectly\n blk-mq: use __smp_call_function_single directly\n btrfs: fix missing increment of bi_remaining\n Revert \"block: Warn and free bio if bi_end_io is not set\"\n block: Warn and free bio if bi_end_io is not set\n blk-mq: fix initializing request\u0027s start time\n block: blk-mq: don\u0027t export blk_mq_free_queue()\n block: blk-mq: make blk_sync_queue support mq\n block: blk-mq: support draining mq queue\n dm cache: increment bi_remaining when bi_end_io is restored\n block: fixup for generic bio chaining\n block: Really silence spurious compiler warnings\n block: Silence spurious compiler warnings\n block: Kill bio_pair_split()\n ...\n" }, { "commit": "dfa19426160046770b3a38985042df9c9760a25a", "tree": "068ba829f449b987c17de7d32d45abc80a880527", "parents": [ "5f13ee9c1ce87b3c99928ab33ef43a2c0d3fd220" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Jan 28 20:12:35 2014 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 30 10:02:54 2014 -0800" }, "message": "ipmi: Add missing rv in ipmi_parisc_probe()\n\nFix\n\n drivers/char/ipmi/ipmi_si_intf.c: In function \u0027ipmi_parisc_probe\u0027:\n drivers/char/ipmi/ipmi_si_intf.c:2752:2: error: \u0027rv\u0027 undeclared (first use in this function)\n drivers/char/ipmi/ipmi_si_intf.c:2752:2: note: each undeclared identifier is reported only once for each function it appears in\n\nIntroduced by commit d02b3709ff8e (\"ipmi: Cleanup error return\")\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "47c542050d306e50f09512eb6339dbf2fc02fddd", "tree": "581ba02825b2cc2bdd36569d50ebfcaa3b83f4e8", "parents": [ "e17b2f114cba5420fb28fa4bfead57d406a16533" ], "author": { "name": "Julien Grall", "email": "julien.grall@linaro.org", "time": "Thu Jan 30 12:56:34 2014 +0000" }, "committer": { "name": "Stefano Stabellini", "email": "stefano.stabellini@eu.citrix.com", "time": "Thu Jan 30 12:56:34 2014 +0000" }, "message": "xen/gnttab: Use phys_addr_t to describe the grant frame base address\n\nOn ARM, address size can be 32 bits or 64 bits (if CONFIG_ARCH_PHYS_ADDR_T_64BIT\nis enabled).\nWe can\u0027t assume that the grant frame base address will always fits in an\nunsigned long. Use phys_addr_t instead of unsigned long as argument for\ngnttab_setup_auto_xlat_frames.\n\nSigned-off-by: Julien Grall \u003cjulien.grall@linaro.org\u003e\nSigned-off-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nReviewed-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\n" }, { "commit": "e17b2f114cba5420fb28fa4bfead57d406a16533", "tree": "0a30053f6a3cc7bcf835b4acb61aa7a0a2d3c19b", "parents": [ "8b271d57b57585a3e3e8cd7abc5f4d7710a0e62d" ], "author": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Jan 20 11:30:41 2014 +0000" }, "committer": { "name": "Stefano Stabellini", "email": "stefano.stabellini@eu.citrix.com", "time": "Thu Jan 30 12:54:20 2014 +0000" }, "message": "xen: swiotlb: handle sizeof(dma_addr_t) !\u003d sizeof(phys_addr_t)\n\nThe use of phys_to_machine and machine_to_phys in the phys\u003c\u003d\u003ebus conversions\ncauses us to lose the top bits of the DMA address if the size of a DMA address is not the same as the size of the phyiscal address.\n\nThis can happen in practice on ARM where foreign pages can be above 4GB even\nthough the local kernel does not have LPAE page tables enabled (which is\ntotally reasonable if the guest does not itself have \u003e4GB of RAM). In this\ncase the kernel still maps the foreign pages at a phys addr below 4G (as it\nmust) but the resulting DMA address (returned by the grant map operation) is\nmuch higher.\n\nThis is analogous to a hardware device which has its view of RAM mapped up\nhigh for some reason.\n\nThis patch makes I/O to foreign pages (specifically blkif) work on 32-bit ARM\nsystems with more than 4GB of RAM.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\n" }, { "commit": "5259a06ef97068b710f45d092a587e8d740f750f", "tree": "da2b4c9718b41cec6e5057a3da593cc93c44759c", "parents": [ "ee291e63293146db64668e8d65eb35c97e8324f4" ], "author": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Tue Jan 28 17:56:30 2014 -0800" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Thu Jan 30 03:58:34 2014 -0800" }, "message": "target: Fix percpu_ref_put race in transport_lun_remove_cmd\n\nThis patch fixes a percpu_ref_put race for se_lun-\u003elun_ref in\ntransport_lun_remove_cmd() where -\u003elun_ref could end up being\nput more than once per command via different target completion\nand fabric release contexts.\n\nIt adds a cmpxchg() for se_cmd-\u003elun_ref_active to ensure that\npercpu_ref_put() is only ever called once per se_cmd.\n\nThis bug was manifesting itself as a LUN shutdown regression\nbug in \u003e\u003d v3.13 code, where percpu_ref_kill() would end up\nhanging indefinately due to the incorrect percpu_ref count.\n\n(Change se_cmd-\u003elun_ref_active from bool -\u003e int to force at\n least a 4-byte cmpxchg with MIPS ll/sc ins. - Fengguang)\n\nReported-by: Tommy Apel \u003ctommyapeldk@gmail.com\u003e\nCc: Tommy Apel \u003ctommyapeldk@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e #3.13+\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "ee291e63293146db64668e8d65eb35c97e8324f4", "tree": "181aa6e882c51aa5ccfe0d116a51a3552e2055f8", "parents": [ "76736db3e291246fbce9db856706af3454b0b078" ], "author": { "name": "Andy Grover", "email": "agrover@redhat.com", "time": "Fri Jan 24 16:18:54 2014 -0800" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Thu Jan 30 03:57:59 2014 -0800" }, "message": "target/iscsi: Fix network portal creation race\n\nWhen creating network portals rapidly, such as when restoring a\nconfiguration, LIO\u0027s code to reuse existing portals can return a false\nnegative if the thread hasn\u0027t run yet and set np_thread_state to\nISCSI_NP_THREAD_ACTIVE. This causes an error in the network stack\nwhen attempting to bind to the same address/port.\n\nThis patch sets NP_THREAD_ACTIVE before the np is placed on g_np_list,\nso even if the thread hasn\u0027t run yet, iscsit_get_np will return the\nexisting np.\n\nAlso, convert np_lock -\u003e np_mutex + hold across adding new net portal\nto g_np_list to prevent a race where two threads may attempt to create\nthe same network portal, resulting in one of them failing.\n\n(nab: Add missing mutex_unlocks in iscsit_add_np failure paths)\n(DanC: Fix incorrect spin_unlock -\u003e spin_unlock_bh)\n\nSigned-off-by: Andy Grover \u003cagrover@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e #3.1+\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "9b0cd304f26b9fca140de15deeac2bf357d1f388", "tree": "03a0d74614865a5b776b2a98a433232013b1d369", "parents": [ "ca2a650f3dfdc30d71d21bcbb04d2d057779f3f9", "ef64cf9d06049e4e9df661f3be60b217e476bee1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:49:12 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:49:12 2014 -0800" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm updates from Dave Airlie:\n \"Been a bit busy, first week of kids school, and waiting on other trees\n to go in before I could send this, so its a bit later than I\u0027d\n normally like.\n\n Highlights:\n - core:\n timestamp fixes, lots of misc cleanups\n - new drivers:\n bochs virtual vga\n - vmwgfx:\n major overhaul for their nextgen virt gpu.\n - i915:\n runtime D3 on HSW, watermark fixes, power well work, fbc fixes,\n bdw is no longer prelim.\n - nouveau:\n gk110/208 acceleration, more pm groundwork, old overlay support\n - radeon:\n dpm rework and clockgating for CIK, pci config reset, big endian\n fixes\n - tegra:\n panel support and DSI support, build as module, prime.\n - armada, omap, gma500, rcar, exynos, mgag200, cirrus, ast:\n fixes\n - msm:\n hdmi support for mdp5\"\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (595 commits)\n drm/nouveau: resume display if any later suspend bits fail\n drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip\n drm/nouveau: implement hooks for needed for drm vblank timestamping support\n drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping\n drm/nv50: fill in crtc mode struct members from crtc_mode_fixup\n drm/radeon/dce8: workaround for atom BlankCrtc table\n drm/radeon/DCE4+: clear bios scratch dpms bit (v2)\n drm/radeon: set si_notify_smc_display_change properly\n drm/radeon: fix DAC interrupt handling on DCE5+\n drm/radeon: clean up active vram sizing\n drm/radeon: skip async dma init on r6xx\n drm/radeon/runpm: don\u0027t runtime suspend non-PX cards\n drm/radeon: add ring to fence trace functions\n drm/radeon: add missing trace point\n drm/radeon: fix VMID use tracking\n drm: ast,cirrus,mgag200: use drm_can_sleep\n drm/gma500: Lock struct_mutex around cursor updates\n drm/i915: Fix the offset issue for the stolen GEM objects\n DRM: armada: fix missing DRM_KMS_FB_HELPER select\n drm/i915: Decouple GPU error reporting from ring initialisation\n ...\n" }, { "commit": "ca2a650f3dfdc30d71d21bcbb04d2d057779f3f9", "tree": "12e5f7f4dea5ba17cc82f2c633bbe9dbf725fb11", "parents": [ "e9e352e9100b98aed1a5fb9e33355c29fb07d5b1", "15cec530e4bc7bed3f51cde8404f96fd28a8c7c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:27:23 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:27:23 2014 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dma updates from Vinod Koul:\n - new driver for BCM2835 used in R-pi\n - new driver for MOXA ART\n - dma_get_any_slave_channel API for DT based systems\n - minor fixes and updates spread acrooss driver\n\n[ The fsl-ssi dual fifo mode support addition clashed badly with the\n other changes to fsl-ssi that came in through the sound merge. I did\n a very rough cut at fixing up the conflict, but Nicolin Chen (author\n of both sides) will need to verify and check things ]\n\n* \u0027for-linus\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (36 commits)\n dmaengine: mmp_pdma: fix mismerge\n dma: pl08x: Export pl08x_filter_id\n acpi-dma: align documentation with kernel-doc format\n dma: fix vchan_cookie_complete() debug print\n DMA: dmatest: extend the \"device\" module parameter to 32 characters\n drivers/dma: fix error return code\n dma: omap: Set debug level to debugging messages\n dmaengine: fix kernel-doc style typos for few comments\n dma: tegra: add support for Tegra148/124\n dma: dw: use %pad instead of casting dma_addr_t\n dma: dw: join split up messages\n dma: dw: fix style of multiline comment\n dmaengine: k3dma: fix sparse warnings\n dma: pl330: Use dma_get_slave_channel() in the of xlate callback\n dma: pl330: Differentiate between submitted and issued descriptors\n dmaengine: sirf: Add device_slave_caps interface\n DMA: Freescale: change BWC from 256 bytes to 1024 bytes\n dmaengine: Add MOXA ART DMA engine driver\n dmaengine: Add DMA_PRIVATE to BCM2835 driver\n dma: imx-sdma: Assign a default script number for ROM firmware cases\n ...\n" }, { "commit": "e9e352e9100b98aed1a5fb9e33355c29fb07d5b1", "tree": "92eb59640f3bfc33f55c54f0494052530a9560dd", "parents": [ "b3a4bcaa5a56860610bd096829702f80273b5a67", "2b8454a75b90d7cd1ac325a0baba77244733354f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:06:01 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:06:01 2014 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform\n\nPull chrome platform cleanups and improvements from Olof Johansson:\n - Use deferred probing on Chrome OS platforms for the i2c device\n registration. This fixes a long-standing race of initialization of\n touchpad/screen on Chromebooks.\n - Added in platform device registration for pstore console on supported\n hardware\n - Misc smaller fixes (__initdata, module exit cleanup, etc)\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:\n platform/chrome: unregister platform driver/device when module exit\n platform/chrome: Make i2c_adapter_names static\n platform/chrome: chromeos_laptop - fix incorrect placement of __initdata tag\n platform/chrome: chromeos_laptop - Use deferred probing\n platform/chrome: chromeos_laptop - Restructure device associations\n platform/chrome: Add pstore platform_device\n" }, { "commit": "b3a4bcaa5a56860610bd096829702f80273b5a67", "tree": "57a37e12d5fc8be6540e9f98cd381f6fb5e06654", "parents": [ "17c7f85460d6b0e2bd11a736683bd81c4388474f", "dd1a175695edf662615e422d1c85eae875a411b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:00:13 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 20:00:13 2014 -0800" }, "message": "Merge tag \u0027iommu-updates-v3.14\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nPull IOMMU Updates from Joerg Roedel:\n \"A few patches have been queued up for this merge window:\n\n - improvements for the ARM-SMMU driver (IOMMU_EXEC support, IOMMU\n group support)\n - updates and fixes for the shmobile IOMMU driver\n - various fixes to generic IOMMU code and the Intel IOMMU driver\n - some cleanups in IOMMU drivers (dev_is_pci() usage)\"\n\n* tag \u0027iommu-updates-v3.14\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (36 commits)\n iommu/vt-d: Fix signedness bug in alloc_irte()\n iommu/vt-d: free all resources if failed to initialize DMARs\n iommu/vt-d, trivial: clean sparse warnings\n iommu/vt-d: fix wrong return value of dmar_table_init()\n iommu/vt-d: release invalidation queue when destroying IOMMU unit\n iommu/vt-d: fix access after free issue in function free_dmar_iommu()\n iommu/vt-d: keep shared resources when failed to initialize iommu devices\n iommu/vt-d: fix invalid memory access when freeing DMAR irq\n iommu/vt-d, trivial: simplify code with existing macros\n iommu/vt-d, trivial: use defined macro instead of hardcoding\n iommu/vt-d: mark internal functions as static\n iommu/vt-d, trivial: clean up unused code\n iommu/vt-d, trivial: check suitable flag in function detect_intel_iommu()\n iommu/vt-d, trivial: print correct domain id of static identity domain\n iommu/vt-d, trivial: refine support of 64bit guest address\n iommu/vt-d: fix resource leakage on error recovery path in iommu_init_domains()\n iommu/vt-d: fix a race window in allocating domain ID for virtual machines\n iommu/vt-d: fix PCI device reference leakage on error recovery path\n drm/msm: Fix link error with !MSM_IOMMU\n iommu/vt-d: use dedicated bitmap to track remapping entry allocation status\n ...\n" }, { "commit": "17c7f85460d6b0e2bd11a736683bd81c4388474f", "tree": "44a50a722b7a3de27bc4943f52fdb0fee336dfb5", "parents": [ "f7a6ad9fa24e4511a143e2b7b8a0d55864fe2edf", "ea3d4011a871e1802e201086195c61e6dbeaf6d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 19:57:43 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 19:57:43 2014 -0800" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull watchdog updates from Wim Van Sebroeck:\n - new driver for bcm281xx watchdog device\n - new driver for gpio based watchdog devices\n - remove DEFINE_PCI_DEVICE_TABLE macro for watchdog device drivers\n - conversion of davinci_wdt and mpc8xxx_wdt to watchdog core\n - improvements on davinci_wdt, at91/dt, at91sam9_wdt and s3c2410_wdt\n - Auto-detect IO address and expand supported chips on w836* super-I/O\n chipsets\n - core: Make dt \"timeout-sec\" property work on drivers w/out min/max\n - fix Kconfig dependencies\n - sirf: Remove redundant of_match_ptr helper\n - mach-moxart: add restart handler\n - hpwdt patch to display better panic information\n - imx2_wdt: disable watchdog timer during low power mode\n\n* git://www.linux-watchdog.org/linux-watchdog: (31 commits)\n watchdog: w83627hf_wdt: Reset watchdog trigger during initialization\n watchdog: w83627hf: Add support for W83697HF and W83697UG\n watchdog: w83627hf: Auto-detect IO address and supported chips\n watchdog: at91sam9_wdt: increase security margin on watchdog counter reset\n watchdog: at91sam9_wdt: avoid spurious watchdog reset during init\n watchdog: at91sam9_wdt: fix secs_to_ticks\n ARM: at91/dt: add watchdog properties to kizbox board\n ARM: at91/dt: add sam9 watchdog default options to SoCs\n watchdog: at91sam9_wdt: update device tree doc\n watchdog: at91sam9_wdt: better watchdog support\n watchdog: sp805_wdt depends also on ARM64\n watchdog: mach-moxart: add restart handler\n watchdog: mpc8xxx_wdt convert to watchdog core\n watchdog: sirf: Remove redundant of_match_ptr helper\n watchdog: hpwdt patch to display informative string\n watchdog: dw_wdt: remove build dependencies\n watchdog: imx2_wdt: disable watchdog timer during low power mode\n watchdog: s3c2410_wdt: Report when the watchdog reset the system\n watchdog: s3c2410_wdt: use syscon regmap interface to configure pmu register\n watchdog: s3c2410_wdt: Handle rounding a little better for timeout\n ...\n" }, { "commit": "f7a6ad9fa24e4511a143e2b7b8a0d55864fe2edf", "tree": "c8bdb1a08729439fc8846c024ded296b9ef3b988", "parents": [ "9076e0cae70c5d6ddb9a0284a20885b2b8814416", "6ff4b105163223741f5a82804f9695221017ae42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 19:56:20 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 19:56:20 2014 -0800" }, "message": "Merge branch \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux\n\nPull more i2c updates from Wolfram Sang:\n \"Mostly bugfixes, small but wanted cleanups, and Paul\u0027s init.h removal\n applied\"\n\n* \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:\n i2c: rcar: fix NACK error code\n i2c: update i2c_algorithm documentation\n i2c: rcar: use devm_clk_get to ensure clock is properly ref-counted\n i2c: rcar: do not print error if device nacks transfer\n i2c: rely on driver core when sanitizing devices\n i2c: delete non-required instances of include \u003clinux/init.h\u003e\n i2c: acorn: is tristate and should use module.h\n i2c: piix4: Standardize log messages\n i2c: piix4: Use different message for AMD Auxiliary SMBus Controller\n i2c: piix4: Add support for AMD ML and CZ SMBus changes\n" }, { "commit": "9076e0cae70c5d6ddb9a0284a20885b2b8814416", "tree": "1b30be795ac206c48e59738cc57a71a393bf7337", "parents": [ "b7a8399edfd7ad3da36d51513ea30a4708b02b52", "7c81c60f3789a082e141d7a013392af5f78db16a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:56:27 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:56:27 2014 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\nPull hwmon updates from Jean Delvare:\n \"This include it87 driver improvements, and a tree-wide change of my\n e-mail address\"\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n Update Jean Delvare\u0027s e-mail address\n hwmon: (it87) Print proper names for the IT8771E and IT8772E\n hwmon: (it87) Add support for the ITE IT8603E\n" }, { "commit": "b7a8399edfd7ad3da36d51513ea30a4708b02b52", "tree": "5da5a480f020cefc4450ca679bf7d193fe82462f", "parents": [ "30c867eebfbd1c25310aec9f152578deaf793080", "b4b0b4a9e0392dbd00e5f033e1329ce61ed06fef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:54:05 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:54:05 2014 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://cavan.codon.org.uk/platform-drivers-x86\n\nPull x86 platform drivers update from Matthew Garrett:\n \"Nothing amazingly special here. Some cleanups, a new driver to\n support a single button on some new HPs, a tiny amount of hardware\n enablement\"\n\n* \u0027for_linus\u0027 of git://cavan.codon.org.uk/platform-drivers-x86:\n ipc: add intel-mid\u0027s pci id macros\n hp-wireless: new driver for hp wireless button for Windows 8\n toshiba_acpi: Support RFKILL hotkey scancode\n hp_accel: Add a new PnP ID HPQ6007 for new HP laptops\n sony-laptop: remove unnecessary assigment of len\n fujitsu-laptop: fix error return code\n dell-laptop: Only install the i8042 filter when rfkill is active\n X86 platform: New BayTrail IOSF-SB MBI driver\n drivers: platform: Include appropriate header file in mxm-wmi.c\n drivers: platform: Mark functions as static in hp_accel.c\n dell-laptop: rkill whitelist Precision models\n ipc: simplify platform data approach\n asus-wmi: Convert to use devm_hwmon_device_register_with_groups\n compal-laptop: Use devm_hwmon_device_register_with_groups\n compal-laptop: Replace SENSOR_DEVICE_ATTR with DEVICE_ATTR\n eeepc-laptop: Convert to use devm_hwmon_device_register_with_groups\n compal-laptop: Use devm_kzalloc to allocate local data structure\n dell-laptop: fix to return error code in dell_send_intensity()\n" }, { "commit": "1d494f36d1fde04188341bf3d3b1a14cdf6fb2c9", "tree": "b8849264f0e8e59b8466c6b6a2db9df71d1ee59a", "parents": [ "19ba20f455a8e9cf15c12891e751fd73c9026292", "c044dc2132d19d8c643cdd340f21afcec177c046" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:08:37 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:08:37 2014 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n \"Several fixups, of note:\n\n 1) Fix unlock of not held spinlock in RXRPC code, from Alexey\n Khoroshilov.\n\n 2) Call pci_disable_device() from the correct shutdown path in bnx2x\n driver, from Yuval Mintz.\n\n 3) Fix qeth build on s390 for some configurations, from Eugene\n Crosser.\n\n 4) Cure locking bugs in bond_loadbalance_arp_mon(), from Ding\n Tianhong.\n\n 5) Must do netif_napi_add() before registering netdevice in sky2\n driver, from Stanislaw Gruszka.\n\n 6) Fix lost bug fix during merge due to code movement in ieee802154,\n noticed and fixed by the eagle eyed Stephen Rothwell.\n\n 7) Get rid of resource leak in xen-netfront driver, from Annie Li.\n\n 8) Bounds checks in qlcnic driver are off by one, from Manish Chopra.\n\n 9) TPROXY can leak sockets when TCP early demux is enabled, fix from\n Holger Eitzenberger\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits)\n qeth: fix build of s390 allmodconfig\n bonding: fix locking in bond_loadbalance_arp_mon()\n tun: add device name(iff) field to proc fdinfo entry\n DT: net: davinci_emac: \"ti, davinci-no-bd-ram\" property is actually optional\n DT: net: davinci_emac: \"ti, davinci-rmii-en\" property is actually optional\n bnx2x: Fix generic option settings\n net: Fix warning on make htmldocs caused by skbuff.c\n llc: remove noisy WARN from llc_mac_hdr_init\n qlcnic: Fix loopback test failure\n qlcnic: Fix tx timeout.\n qlcnic: Fix initialization of vlan list.\n qlcnic: Correct off-by-one errors in bounds checks\n net: Document promote_secondaries\n net: gre: use icmp_hdr() to get inner ip header\n i40e: Add missing braces to i40e_dcb_need_reconfig()\n xen-netfront: fix resource leak in netfront\n net: 6lowpan: fixup for code movement\n hyperv: Add support for physically discontinuous receive buffer\n sky2: initialize napi before registering device\n net: Fix memory leak if TPROXY used with TCP early demux\n ...\n" }, { "commit": "19ba20f455a8e9cf15c12891e751fd73c9026292", "tree": "7d3322f1170859a2abef4c7fcfeb523266ab73a5", "parents": [ "3308ee8f4582f97d1c08864dd06f7291aea323e5", "a54983ae64b12cf7e098c464c7eaf058752bc9cc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:07:52 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 29 18:07:52 2014 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull sparc update from David Miller:\n \"Two cleanups from Paul Gortmaker and hook up the new scheduler system\n calls\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc: Hook up sched_setattr and sched_getattr syscalls.\n sparc: don\u0027t use module_init in non-modular pci.c code\n sparc: delete non-required instances of include \u003clinux/init.h\u003e\n" }, { "commit": "ef64cf9d06049e4e9df661f3be60b217e476bee1", "tree": "6c375f94bb68dc9f5e273dd85ce76d3f88cbbb50", "parents": [ "279b9e0cc30052a1acb6e124120b754eb20b35aa", "f3980dc50c5117a952baee7135aae50d48304af3" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 30 10:46:06 2014 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 30 10:46:06 2014 +1000" }, "message": "Merge branch \u0027drm-nouveau-next\u0027 of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next\n\nmore fixes for nouveau.\n\n* \u0027drm-nouveau-next\u0027 of git://anongit.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau: resume display if any later suspend bits fail\n drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip\n drm/nouveau: implement hooks for needed for drm vblank timestamping support\n drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping\n drm/nv50: fill in crtc mode struct members from crtc_mode_fixup\n" }, { "commit": "f3980dc50c5117a952baee7135aae50d48304af3", "tree": "34f162b4df261f10701e13e279cf09363023797c", "parents": [ "09c3de135063f93d7137ad112f551f293b1204cf" ], "author": { "name": "Ilia Mirkin", "email": "imirkin@alum.mit.edu", "time": "Thu Jan 23 02:45:02 2014 -0500" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 30 09:20:28 2014 +1000" }, "message": "drm/nouveau: resume display if any later suspend bits fail\n\nIf either idling channels or suspending the fence were to fail, the\ndisplay would never be resumed. Also if a client fails, resume the fence\n(not functionally important, but it would potentially leak memory).\n\nSee https://bugs.freedesktop.org/show_bug.cgi?id\u003d70213\n\nSigned-off-by: Ilia Mirkin \u003cimirkin@alum.mit.edu\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "09c3de135063f93d7137ad112f551f293b1204cf", "tree": "7c0e7ac9c56b5b52cf97314033df02a54369da9f", "parents": [ "d83ef85395c9c1fae7636dca59f95c64963b307d" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Wed Jan 29 11:05:09 2014 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 30 09:20:28 2014 +1000" }, "message": "drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip\n\nFixes a regression introduced by d5c1e84b3a130f0\n\"drm/nouveau: hold mutex while syncing to kernel channel\".\n\nCc: stable@vger.kernel.org #3.13\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d83ef85395c9c1fae7636dca59f95c64963b307d", "tree": "883e6852c04d30c37d012aaad65da6db318e22e8", "parents": [ "d2fa7d32ea7b54d910637e50df4972e3540722d4" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 14 13:37:49 2013 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 30 09:20:27 2014 +1000" }, "message": "drm/nouveau: implement hooks for needed for drm vblank timestamping support\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d2fa7d32ea7b54d910637e50df4972e3540722d4", "tree": "075f4af98aca095896f07a87e4a5eddc980226e7", "parents": [ "eb2e9686d6bc94559dc7f25ed1e67ebbf0a9a41b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 14 13:37:48 2013 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 30 08:18:36 2014 +1000" }, "message": "drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "eb2e9686d6bc94559dc7f25ed1e67ebbf0a9a41b", "tree": "3597e659b268a9ec682a37a6d8c9ddddc13fec17", "parents": [ "1139ffb96b3f4e8be9006552d2dd4d302d62c2ee" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 24 10:13:23 2014 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 30 08:18:26 2014 +1000" }, "message": "drm/nv50: fill in crtc mode struct members from crtc_mode_fixup\n\nThe DRM uses the adjusted mode to calculate constants for vblank\ntimestamping. Our encoder mode_fixup (usually) replaces this data\nwith our backend mode information, which doesn\u0027t have the needed\ndata filled in already.\n\nReported-by: Mario Kleiner mario.kleiner.de@gmail.com\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "78fe9e545ce6d510b979dc2d8e14096a279fc519", "tree": "aef15c048fddc24df5f37292ed0e3d5dd1ba0a3f", "parents": [ "6802d4bad83f50081b2788698570218aaff8d10e" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Jan 28 23:49:37 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 16:10:54 2014 -0500" }, "message": "drm/radeon/dce8: workaround for atom BlankCrtc table\n\nSome DCE8 boards have a funky BlankCrtc table that results\nin a timeout when trying to blank the display. The\ntimeout is harmless (all operations needed from the table\nare complete), but wastes time and is confusing to users so\nwork around it.\n\nbug:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d73420\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "6802d4bad83f50081b2788698570218aaff8d10e", "tree": "b330462d2c9091ef7c9d7f26fcfa9102edc4c13d", "parents": [ "ffcda352b569dcf5be5c8a5f57545794acf4adb9" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jan 27 18:29:35 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 16:10:53 2014 -0500" }, "message": "drm/radeon/DCE4+: clear bios scratch dpms bit (v2)\n\nThe BlankCrtc table in some DCE8 boards has some\nlogic shortcuts for the vbios when this bit is set.\nClear it for driver use.\n\nv2: fix typo\n\nBug:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d73420\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "ffcda352b569dcf5be5c8a5f57545794acf4adb9", "tree": "73bebeaa58fa13b7c926ba233d7dcc7deeeccc2f", "parents": [ "e9a321c6b2ac954a7dbf235f419c255a424a1273" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jan 27 13:04:56 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 16:10:37 2014 -0500" }, "message": "drm/radeon: set si_notify_smc_display_change properly\n\nThis is effectively a revert of 4573388c92ee60b4ed72b8d95b73df861189988c.\n\nForcing a display active when there is none causes problems with\ndpm on some SI boards which results in improperly initialized\ndpm state and boot failures on some boards. As for the bug commit\n4573388c92ee tried to address, one can manually force the state to\nhigh for better performance when using the card as a headless compute\nnode until a better fix is developed.\n\nbugs:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d73788\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d69395\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\ncc: stable@vger.kernel.org\n" }, { "commit": "e9a321c6b2ac954a7dbf235f419c255a424a1273", "tree": "00f898ea95a749b64b284c375566055f7ee7cc65", "parents": [ "50efa51afddb50a6ab47ee15614fcf180130888c" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jan 27 11:54:44 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:05 2014 -0500" }, "message": "drm/radeon: fix DAC interrupt handling on DCE5+\n\nDCE5 and newer hardware only has 1 DAC. Use the correct\noffset. This may fix display problems on certain board\nconfigurations.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "50efa51afddb50a6ab47ee15614fcf180130888c", "tree": "5f80ce2157217fe83c3569a484e03c2e15f5e4d7", "parents": [ "b9ace36f13c6fc46391c9d40edc648eef3a59ab0" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jan 27 11:26:33 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:05 2014 -0500" }, "message": "drm/radeon: clean up active vram sizing\n\nIf we are not able to properly initialize one of the gpu\nengines for buffer paging, we limit vram to the size of\nthe cpu visible aperture. We generally either use the gfx\nor dma engine to do this. Clean up the size limiting code\nto only adjust the size based on what ring is selected\nfor buffer paging rather than making assumptions about which\nengine is selected for paging.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Christian König \u003cchristian.koenig@amd.com\u003e\n" }, { "commit": "b9ace36f13c6fc46391c9d40edc648eef3a59ab0", "tree": "13f85bf9e838463852ec77d7cb260036600555c7", "parents": [ "9babd35ad72af631547c7ca294bc2e931cc40e58" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jan 27 10:59:51 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:04 2014 -0500" }, "message": "drm/radeon: skip async dma init on r6xx\n\nThe hw is buggy and it\u0027s not currently used, but it\u0027s\ncurrently still initialized by the driver. Skip the init.\nSkipping init also seems to improve stability with dpm on\nsome r6xx asics.\n\nbug:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d66963\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Christian König \u003cchristian.koenig@amd.com\u003e\n" }, { "commit": "9babd35ad72af631547c7ca294bc2e931cc40e58", "tree": "0fa3c2fc8cd0b09bb58ce7e6e5f931c73ae28160", "parents": [ "1d7841676676691c205bfcb3d99c5997466a3408" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Jan 24 14:59:42 2014 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:03 2014 -0500" }, "message": "drm/radeon/runpm: don\u0027t runtime suspend non-PX cards\n\nPrevent runtime suspend of non-PX GPUs. Runtime suspend is\nnot what we want in those cases.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "1d7841676676691c205bfcb3d99c5997466a3408", "tree": "ca2f4c9b6452619a3730c75edcf54496cee178b4", "parents": [ "31dd8d9347c4bf288572ad1c5513d9b778989cd5" ], "author": { "name": "Christian König", "email": "christian.koenig@amd.com", "time": "Thu Jan 23 14:24:17 2014 +0100" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:03 2014 -0500" }, "message": "drm/radeon: add ring to fence trace functions\n\nSigned-off-by: Christian König \u003cchristian.koenig@amd.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "31dd8d9347c4bf288572ad1c5513d9b778989cd5", "tree": "b47c3911a82e71181effa1b1c464cb16799ee7d1", "parents": [ "593b26353f1965682db955d0d2af8bc564aabdf8" ], "author": { "name": "Christian König", "email": "christian.koenig@amd.com", "time": "Thu Jan 23 14:24:16 2014 +0100" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:02 2014 -0500" }, "message": "drm/radeon: add missing trace point\n\nSigned-off-by: Christian König \u003cchristian.koenig@amd.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "593b26353f1965682db955d0d2af8bc564aabdf8", "tree": "dc24b66b42f54aa23d73d58fad5be7c02ee19d93", "parents": [ "45ab1e07808585c645bc82afd7487a91390f5511" ], "author": { "name": "Christian König", "email": "christian.koenig@amd.com", "time": "Thu Jan 23 14:24:15 2014 +0100" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jan 29 15:23:01 2014 -0500" }, "message": "drm/radeon: fix VMID use tracking\n\nOtherwise we allocate a new VMID on nearly every submit.\n\nSigned-off-by: Christian König \u003cchristian.koenig@amd.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "7c81c60f3789a082e141d7a013392af5f78db16a", "tree": "f3da560b70545e6780ee29319c003418d986bb05", "parents": [ "b523bb75098b1ed4dd98cb651b7b71e5b8c4f533" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Jan 29 20:40:08 2014 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Jan 29 20:40:08 2014 +0100" }, "message": "Update Jean Delvare\u0027s e-mail address\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "b523bb75098b1ed4dd98cb651b7b71e5b8c4f533", "tree": "57e1d8b258cf12ff28de1aa68ceda6e63d49651d", "parents": [ "c145d5c628c8ca02dabbf6829ae19ce525d42796" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Jan 29 20:40:08 2014 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Jan 29 20:40:08 2014 +0100" }, "message": "hwmon: (it87) Print proper names for the IT8771E and IT8772E\n\nThe driver prints IT8771F and IT8772F instead of IT8771E and IT8772E\nrespectively when the driver is loaded. This is a cosmetic only bug\nbut let\u0027s fix it.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "c145d5c628c8ca02dabbf6829ae19ce525d42796", "tree": "0d3e553a0ae9abaf0c8e67ad7f42bc57431a98a1", "parents": [ "d8ec26d7f8287f5788a494f56e8814210f0e64be" ], "author": { "name": "Rudolf Marek", "email": "r.marek@assembler.cz", "time": "Wed Jan 29 20:40:08 2014 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Jan 29 20:40:08 2014 +0100" }, "message": "hwmon: (it87) Add support for the ITE IT8603E\n\nAdd support for IT8603E.\n\nThis closes bug #57861:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d57861\n\n[JD: Fixes and clean-ups.]\n\nSigned-off-by: Rudolf Marek \u003cr.marek@assembler.cz\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "15cec530e4bc7bed3f51cde8404f96fd28a8c7c5", "tree": "731235fab2ca0bef5ef782deeb8d1421cf39dbb4", "parents": [ "6d05c9fabfdc8642b42a1000cd092b2a7543d85f" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 28 21:45:38 2014 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Jan 29 17:38:57 2014 +0530" }, "message": "dmaengine: mmp_pdma: fix mismerge\n\nThe merge between 2b7f65b11d87f \"mmp_pdma: Style neatening\" and\n8010dad55a0ab0 \"dma: add dma_get_any_slave_channel(), for use in of_xlate()\"\ncaused a build error by leaving obsolete code in place:\n\n mmp_pdma.c: In function \u0027mmp_pdma_dma_xlate\u0027:\n mmp_pdma.c:909:31: error: \u0027candidate\u0027 undeclared\n mmp_pdma.c:912:3: error: label \u0027retry\u0027 used but not defined\n mmp_pdma.c:901:24: warning: unused variable \u0027c\u0027 [-Wunused-variable]\n\nThis removes the extraneous lines.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "88ea0f2c02f461613dd67664a79db525e9723609", "tree": "55f814cf8dae53b6bee5fcd09de99757f091dcf1", "parents": [ "82e180598b54873553fb1d285fb0c90fc54f8f23", "eb8c68ef558e6cba241e7ada54f6b3427cb2bf68", "ba7abeb1bab10da64919d4ab890ddec71428cd04" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed Jan 29 11:48:23 2014 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed Jan 29 11:48:23 2014 +0100" }, "message": "Merge branches \u0027pm-cpufreq\u0027 and \u0027pm-devfreq\u0027\n\n* pm-cpufreq:\n acpi-cpufreq: De-register CPU notifier and free struct msr on error.\n\n* pm-devfreq:\n PM / devfreq: Disable Exynos4 driver build on multiplatform\n" }, { "commit": "82e180598b54873553fb1d285fb0c90fc54f8f23", "tree": "e4edee0847bef9a340589532bce5f1277d9c231f", "parents": [ "09da8dfa98682d871987145ed11e3232accac860", "f778d1218f10504a87353c696faf116481fa27a6", "a951c773bc39677ef3fa42814be7f5218a3100b2", "49a12877d2777cadcb838981c3c4f5a424aef310", "79c0373f3e847309f4f33d23f2bf088ee3b1ac34", "481c13814a4ecc8305fb7c871067a73cafd09d07" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed Jan 29 11:47:18 2014 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed Jan 29 11:47:18 2014 +0100" }, "message": "Merge branches \u0027acpi-processor\u0027, \u0027acpi-hotplug\u0027, \u0027acpi-init\u0027, \u0027acpi-pm\u0027 and \u0027acpica\u0027\n\n* acpi-processor:\n ACPI / scan: reduce log level of \"ACPI: \\_PR_.CPU4: failed to get CPU APIC ID\"\n ACPI / processor: Return specific error value when mapping lapic id\n\n* acpi-hotplug:\n ACPI / scan: Clear match_driver flag in acpi_bus_trim()\n\n* acpi-init:\n ACPI / init: Flag use of ACPI and ACPI idioms for power supplies to regulator API\n\n* acpi-pm:\n ACPI / PM: Use ACPI_COMPANION() to get ACPI companions of devices\n\n* acpica:\n ACPICA: Remove bool usage from ACPICA.\n" }, { "commit": "a951c773bc39677ef3fa42814be7f5218a3100b2", "tree": "49a241142e9a90d0b640f2be5e68d91d951e52db", "parents": [ "00159a2013269bc0a617de885e4b921349192bd0" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Mon Jan 27 23:08:09 2014 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed Jan 29 11:40:43 2014 +0100" }, "message": "ACPI / scan: Clear match_driver flag in acpi_bus_trim()\n\nDrivers should not bind to struct acpi_device objects that\nacpi_bus_trim() has been called for, so make that function\nclear flags.match_driver for those objects.\n\nIf that is not done, an ACPI driver may theoretically try to operate\na device that is not physically present.\n\nFixes: 202317a573b2 (ACPI / scan: Add acpi_device objects for all device nodes in the namespace)\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nAcked-by: Toshi Kani \u003ctoshi.kani@hp.com\u003e\n" }, { "commit": "c044dc2132d19d8c643cdd340f21afcec177c046", "tree": "384fa95eb06d009f68e2885d17851d38664944a7", "parents": [ "6fde8f037e604e05df1529e4689041715d6d55d2" ], "author": { "name": "Eugene Crosser", "email": "Eugene.Crosser@ru.ibm.com", "time": "Wed Jan 29 09:23:48 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 29 00:43:33 2014 -0800" }, "message": "qeth: fix build of s390 allmodconfig\n\ncommit 949efd1c \"qeth: bridgeport support - basic control\" broke\ns390 allmodconfig. This patch fixes this by eliminating one of the\ncross-module calls, and by making two other calls via function\npointers in the qeth_discipline structure.\n\nSigned-off-by: Eugene Crosser \u003cEugene.Crosser@ru.ibm.com\u003e\nSigned-off-by: Frank Blaschka \u003cfrank.blaschka@de.ibm.com\u003e\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fde8f037e604e05df1529e4689041715d6d55d2", "tree": "4cdf943fb2d475899f0a0d5a40cd4002184faff1", "parents": [ "93e14b6d776e850a371fe4234a06088f210d8651" ], "author": { "name": "Ding Tianhong", "email": "dingtianhong@huawei.com", "time": "Tue Jan 28 11:48:53 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 28 23:48:33 2014 -0800" }, "message": "bonding: fix locking in bond_loadbalance_arp_mon()\n\nThe commit 1d3ee88ae0d605629bf369\n(bonding: add netlink attributes to slave link dev)\nhas add rtmsg_ifinfo() in bond_set_active_slave() and\nbond_set_backup_slave(), so the two function need to\ncalled in RTNL lock, but bond_loadbalance_arp_mon()\nonly calling these functions in RCU, warning message\nwill occurs.\n\nfix this by add a new function bond_slave_state_change(),\nwhich will reset the slave\u0027s state after slave link check,\nso remove the bond_set_xxx_slave() from the cycle and only\nrecord the slave_state_changed, this will call the new\nfunction to set all slaves to new state in RTNL later.\n\nCc: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nCc: Veaceslav Falico \u003cvfalico@redhat.com\u003e\nCc: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: Ding Tianhong \u003cdingtianhong@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93e14b6d776e850a371fe4234a06088f210d8651", "tree": "18422336d2b25bc595dfea498d553e0d71ae3130", "parents": [ "52efcea59eeae9f850e544c41764954273b0912c" ], "author": { "name": "Masatake YAMATO", "email": "yamato@redhat.com", "time": "Wed Jan 29 16:43:31 2014 +0900" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 28 23:46:56 2014 -0800" }, "message": "tun: add device name(iff) field to proc fdinfo entry\n\nA file descriptor opened for /dev/net/tun and a tun device are\nconnected with ioctl. Though understanding the connection is\nimportant for trouble shooting, no way is given to a user to know\nthe connected device for a given file descriptor at userland.\n\nThis patch adds a new fdinfo field for the device name connected to\na file descriptor opened for /dev/net/tun.\n\nHere is an example of the field:\n\n # lsof | grep tun\n qemu-syst 4565 qemu 25u CHR 10,200 0t138 12921 /dev/net/tun\n ...\n\n # cat /proc/4565/fdinfo/25\n pos:\t138\n flags:\t0104002\n iff:\tvnet0\n\n # ip link show dev vnet0\n 8: vnet0: \u003cBROADCAST,MULTICAST,UP,LOWER_UP\u003e mtu 1500 ...\n\nchangelog:\n\n v2: indent iff just like the other fdinfo fields are.\n v3: remove unused variable.\n Both are suggested by David Miller \u003cdavem@davemloft.net\u003e.\n\nSigned-off-by: Masatake YAMATO \u003cyamato@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b2abcbc5ef1c135b03c7009f98350dbad2fe293", "tree": "9b7bfe57ce07fb7270d0c314e33d3e5bae0ffe69", "parents": [ "0e47c969c65e213421450c31043353ebe3c67e0c" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Jan 06 15:25:39 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 28 23:38:23 2014 -0800" }, "message": "sparc: delete non-required instances of include \u003clinux/init.h\u003e\n\nNone of these files are actually using any __init type directives\nand hence don\u0027t need to include \u003clinux/init.h\u003e. Most are just a\nleft over from __devinit and __cpuinit removal, or simply due to\ncode getting copied from one driver to the next.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "61eae5bb06496a6633ba000a1d7546b494e00081", "tree": "c206b27ba53090559631ffbee60efea6b8d83d4b", "parents": [ "dfea4aa2261d64effbcc1992a59301270478c49a" ], "author": { "name": "Rashika Kheria", "email": "rashika.kheria@gmail.com", "time": "Tue Dec 17 16:41:11 2013 +0530" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 28 23:35:09 2014 -0800" }, "message": "drivers: ide: Include appropriate header file in ide-pio-blacklist.c\n\nInclude appropriate header file include/linux/ide.h in file\nide-pio-blacklist.c because function ide_scan_pio_blacklist() has it\u0027s\nprototype declaration in include/linux/ide.h.\n\nThis eliminates the following warning in ide-pio-blacklist.c:\ndrivers/ide/ide-pio-blacklist.c:85:5: warning: no previous prototype for ‘ide_scan_pio_blacklist’ [-Wmissing-prototypes]\n\nSigned-off-by: Rashika Kheria \u003crashika.kheria@gmail.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dfea4aa2261d64effbcc1992a59301270478c49a", "tree": "6f39734788288318189334c82c568841a19904be", "parents": [ "0e47c969c65e213421450c31043353ebe3c67e0c" ], "author": { "name": "Rashika Kheria", "email": "rashika.kheria@gmail.com", "time": "Tue Dec 17 16:38:16 2013 +0530" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 28 23:35:09 2014 -0800" }, "message": "drivers: ide: Include appropriate header file in ide-cd_verbose.c\n\nInclude appropriate header file ide-cd.h in ide-cd_verbose.c because\nfunction ide_cd_log_error() has its prototype declaration in ide-cd.h.\nAlso, include linux/ide.h because it contains certain declarations\nnecessary for including ide-cd.h.\n\nThis eliminates the following warnings in ide-cd_verbose.c:\ndrivers/ide/ide-cd_verbose.c:251:6: warning: no previous prototype for ‘ide_cd_log_error’ [-Wmissing-prototypes]\n\nSigned-off-by: Rashika Kheria \u003crashika.kheria@gmail.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2c2e6ecfd077cbae72d32568af58c4ba57826c84", "tree": "f46be303b75ef724a47fea4d9bb58bea9e1b4e71", "parents": [ "3fa8cad82b94d0bed002571bd246f2299ffc876b" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Tue Jan 14 16:32:40 2014 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 17:02:24 2014 +1100" }, "message": "powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.\n\nFollowing patch ports the cpuidle framework for powernv\nplatform and also implements a cpuidle back-end powernv\nidle driver calling on to power7_nap and snooze idle states.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "3fa8cad82b94d0bed002571bd246f2299ffc876b", "tree": "3c85c1da6f6d78a8f96348df0e4d23a38256ebe9", "parents": [ "bf7f61f2dfc5c5764e862bee317a5a227091d0d2" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Tue Jan 14 16:26:38 2014 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 17:02:24 2014 +1100" }, "message": "powerpc/pseries/cpuidle: smt-snooze-delay cleanup.\n\nsmt-snooze-delay was designed to disable NAP state or delay the entry\nto the NAP state prior to adoption of cpuidle framework. This\nis per-cpu variable. With the coming of CPUIDLE framework,\nstates can be disabled on per-cpu basis using the cpuidle/enable\nsysfs entry.\n\nAlso, with the coming of cpuidle driver each state\u0027s target residency\nis per-driver unlike earlier which was per-device. Therefore,\nthe per-cpu sysfs smt-snooze-delay which decides the target residency\nof the idle state on a particular cpu causes more confusion to the user\nas we cannot have different smt-snooze-delay (target residency)\nvalues for each cpu.\n\nIn the current code, smt-snooze-delay functionality is completely broken.\nIt makes sense to remove smt-snooze-delay from idle driver with the\ncoming of cpuidle framework.\nHowever, sysfs files are retained as ppc64_util currently\nutilises it. Once we fix ppc64_util, propose to clean\nup the kernel code.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "bf7f61f2dfc5c5764e862bee317a5a227091d0d2", "tree": "8eef750018a9defe5729129a66335a5b076cb1f9", "parents": [ "12431c64979bcda4786437f2a83aa0afc8bfc9da" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Tue Jan 14 16:26:28 2014 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 17:02:23 2014 +1100" }, "message": "powerpc/pseries/cpuidle: Remove MAX_IDLE_STATE macro.\n\nThis patch removes the usage of MAX_IDLE_STATE macro\nand dead code around it. The number of states\nare determined at run time based on the cpuidle\nstate table selected on a given platform\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "12431c64979bcda4786437f2a83aa0afc8bfc9da", "tree": "d5f9298fff30f6d120a1ff41f426e130a0466cea", "parents": [ "b69dbba059d9048b9909ed9898086dd3fbe22be7" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Tue Jan 14 16:26:18 2014 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 17:02:23 2014 +1100" }, "message": "powerpc/pseries/cpuidle: Make cpuidle-pseries backend driver a non-module.\n\nCurrently cpuidle-pseries backend driver cannot be\nbuilt as a module due to dependencies wrt cpuidle framework.\nThis patch removes all the module related code in the driver.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "b69dbba059d9048b9909ed9898086dd3fbe22be7", "tree": "2b9f0119eb06e23b373c357f5d4d5750895dfc76", "parents": [ "962e7bd4976516c34fc9ef51d536aab801980767" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Tue Jan 14 16:26:09 2014 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 17:02:22 2014 +1100" }, "message": "powerpc/pseries/cpuidle: Use cpuidle_register() for initialisation.\n\nThis patch replaces the cpuidle driver and devices initialisation\ncalls with a single generic cpuidle_register() call\nand also includes minor refactoring of the code around it.\n\nRemove the cpu online check in snooze loop, as this code can\nonly locally run on a cpu only if it is online. Therefore,\nthis check is not required.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "962e7bd4976516c34fc9ef51d536aab801980767", "tree": "b1ddb6a14ffd3d83567d16b2265a02ba16331658", "parents": [ "d765ff23e3181413fb1bed090c8d702165448a84" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Tue Jan 14 16:26:02 2014 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 17:02:22 2014 +1100" }, "message": "powerpc/pseries/cpuidle: Move processor_idle.c to drivers/cpuidle.\n\nMove the file from arch specific pseries/processor_idle.c\nto drivers/cpuidle/cpuidle-pseries.c\nMake the relevant Makefile and Kconfig changes.\nAlso, introduce Kconfig.powerpc in drivers/cpuidle\nfor all powerpc cpuidle drivers.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e9a371100dfdfa4c9f994059d19d98c9b4fd80af", "tree": "11e9d240d87834f9da927aaa4027e7dfcbd01eb8", "parents": [ "d891ea23d5203e5c47439b2a174f86a00b356a6c", "bc75059422338197ce487d338ac9c898761e1e61" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 16:53:55 2014 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jan 29 16:53:55 2014 +1100" }, "message": "Merge remote-tracking branch \u0027agust/next\u0027 into next\n\n\u003c\u003c\nSwitch mpc512x to the common clock framework and adapt mpc512x\ndrivers to use the new clock driver. Old PPC_CLOCK code is\nremoved entirely since there are no users any more.\n\u003e\u003e\n" }, { "commit": "0e47c969c65e213421450c31043353ebe3c67e0c", "tree": "5057541fd3dc3521cb0946880d6925f1185dc7b7", "parents": [ "268943fb7529a15254a5247372119ba4bd735e94", "0ff76a920e3558307567b45aa0a91fb914924bfc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:56:37 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:56:37 2014 -0800" }, "message": "Merge tag \u0027for-linus-20140127\u0027 of git://git.infradead.org/linux-mtd\n\nPull MTD updates from Brian Norris:\n - Add me (Brian Norris) as an additional MTD maintainer (it\u0027d be nice to get\n David\u0027s \"ack\" for this; I\u0027m sure he approves, but he\u0027s been pretty silent\n lately)\n - Add Ezequiel Garcie as maintainer for the pxa3xx NAND driver\n - Last (?) round of pxa3xx improvements for supporting Armada 370/XP\n - Typical churn in driver boilerplate (OOM messages, printk()\u0027s, devm_*, etc.)\n - Quad read mode support for SPI NOR driver (m25p80)\n - Update Davinci NAND driver to prepare for use on new platforms\n - Begin to kill off NAND_MAX_{PAGE,OOB}SIZE macros; more work is pending\n - Miscellaneous NAND device support (new IDs)\n - Add READ RETRY support for Micron MLC NAND\n - Support new GPMI NAND ECC layout device-tree binding\n - Avoid mapping stack/vmalloc() memory for GPMI NAND DMA\n\n* tag \u0027for-linus-20140127\u0027 of git://git.infradead.org/linux-mtd: (151 commits)\n mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf\n mtd: gpmi: allocate a proper buffer for non ECC read/write\n mtd: m25p80: Set rx_nbits for Quad SPI transfers\n mtd: m25p80: Enable Quad SPI read transfers for s25fl512s\n mtd: s3c2410: Merge plat/regs-nand.h into s3c2410.c\n mtd: mtdram: add missing \u0027const\u0027\n mtd: m25p80: assign default read command\n mtd: nuc900_nand: remove redundant return value check of platform_get_resource()\n mtd: plat_nand: remove redundant return value check of platform_get_resource()\n mtd: nand: add Intel manufacturer ID\n mtd: nand: add SanDisk manufacturer ID\n mtd: nand: add support for Samsung K9LCG08U0B\n mtd: nand: pxa3xx: Add support for 2048 bytes page size devices\n mtd: m25p80: Use OPCODE_QUAD_READ_4B for 4-byte addressing\n mtd: nand: don\u0027t use {read,write}_buf for 8-bit transfers\n mtd: nand: use __packed shorthand\n mtd: nand: support Micron READ RETRY\n mtd: nand: add generic READ RETRY support\n mtd: nand: add ONFI vendor block for Micron\n mtd: nand: localize ECC failures per page\n ...\n" }, { "commit": "268943fb7529a15254a5247372119ba4bd735e94", "tree": "790d42cfade2a35b0eec5e1b7e0ac3795d399bcc", "parents": [ "2ad48ee810335bdd99de96e1a0796ba34c0e8301", "3cb6f44aedf519dce4a9106dec675b94d675c539" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:53:01 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:53:01 2014 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds\n\nPull LED subsystem update from Bryan Wu:\n \"Basically this cycle is mostly cleanup for LED subsystem\"\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:\n leds: s3c24xx: Remove hardware.h inclusion\n leds: replace list_for_each with list_for_each_entry\n leds: kirkwood: Cleanup in header files\n leds: pwm: Remove a warning on non-DT platforms\n leds: leds-pwm: fix duty time overflow.\n leds: leds-mc13783: Remove unneeded mc13xxx_{un}lock\n leds: leds-mc13783: Remove duplicate field in platform data\n drivers: leds: leds-tca6507: check CONFIG_GPIOLIB whether defined for \u0027gpio_base\u0027\n leds: lp5523: Support LED MUX configuration on running a pattern\n leds: lp5521/5523: Fix multiple engine usage bug\n LEDS: tca6507 - fix up some comments.\n LEDS: tca6507: add device-tree support for GPIO configuration.\n LEDS: tca6507 - fix bugs in parsing of device-tree configuration.\n" }, { "commit": "2ad48ee810335bdd99de96e1a0796ba34c0e8301", "tree": "23fb16423129a22e3e866005883b4f461aadcd84", "parents": [ "d30492adea3a82e7120bcf60893aaaab711f90a6", "4fbd269f1f9f8020dd9474b60e55c4f34d267b08" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:50:24 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:50:24 2014 -0800" }, "message": "Merge tag \u0027tty-3.14-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull serial fixes from Greg KH:\n \"Here are tiny and assorted serial driver fixes that have been in a\n branch in my tree for a while and somehow did not get properly merged\n into my big TTY / Serial pull request for 3.14-rc1. Sorry about that.\n\n All have been in linux-next for a while with no issues\"\n\n* tag \u0027tty-3.14-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n tty: xuartps: Properly guard sysrq specific code\n serial: 8250: Fix initialisation of Quatech cards with the AMCC PCI chip\n serial: icom: dereference after free in load_code()\n serial: 8250_dw: add new ACPI IDs\n tty: serial: pch: don\u0027t crash if DMA enabled but not loaded\n serial: samsung: move clock deactivation below uart registration\n" }, { "commit": "d30492adea3a82e7120bcf60893aaaab711f90a6", "tree": "082d1dff4d71ccbd722b5edd47411acad110b636", "parents": [ "f1499382f114231cbd1e3dee7e656b50ce9d8236", "fd3fdaf09f26cd4f53fd4d7cdfe8e3dbb55a4dda" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:44:53 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 28 18:44:53 2014 -0800" }, "message": "Merge tag \u0027clk-for-linus-3.14-part2\u0027 of git://git.linaro.org/people/mike.turquette/linux\n\nPull more clock framework changes from Mike Turquette:\n \"The second half of the clock framework pull requeust for 3.14 is\n dominated by platform support for Qualcomm\u0027s MSM SoCs, DT binding\n updates for TI\u0027s OMAP-ish processors and additional support for\n Samsung chips.\n\n Additionally there are other smaller clock driver changes and several\n last minute fixes. This pull request also includes the HiSilicon\n support that depends on the already-merged arm-soc pull request\"\n\n[ Fix up stupid compile error in the source tree with evil merge - Grumpy Linus ]\n\n* tag \u0027clk-for-linus-3.14-part2\u0027 of git://git.linaro.org/people/mike.turquette/linux: (49 commits)\n clk: sort Makefile\n clk: sunxi: fix overflow when setting up divided factors\n clk: Export more clk-provider functions\n dt-bindings: qcom: Fix warning with duplicate dt define\n clk: si5351: remove variant from platform_data\n clk: samsung: Remove unneeded semicolon\n clk: qcom: Fix modular build\n ARM: OMAP3: use DT clock init if DT data is available\n ARM: AM33xx: remove old clock data and link in new clock init code\n ARM: AM43xx: Enable clock init\n ARM: OMAP: DRA7: Enable clock init\n ARM: OMAP4: remove old clock data and link in new clock init code\n ARM: OMAP2+: io: use new clock init API\n ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT\n ARM: OMAP3: hwmod: initialize clkdm from clkdm_name\n ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm\n ARM: OMAP2+: clock: use driver API instead of direct memory read/write\n ARM: OMAP2+: clock: add support for indexed memmaps\n ARM: dts: am43xx clock data\n ARM: dts: AM35xx: use DT clock data\n ...\n" }, { "commit": "33f9e6f57eb91cafcee4d8f185487bce6787957b", "tree": "55b981d25fd0cf61db89dce9fd0a69b3c91bb748", "parents": [ "7fceb4de75f993a598d27af835e87b19b8be514e" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Tue Jan 28 17:28:51 2014 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 28 18:08:57 2014 -0800" }, "message": "bnx2x: Fix generic option settings\n\nWhen user tried to change generic options using \"ethtool -s\" command, while SFP\nmodule is plugged out or during module detection, the command would have failed\nwith \"Unsupported port type\" message. The fix is to ignore the port option in\ncase it\u0027s same as the current port configuration.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Ariel Elior \u003cariele@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "45ab1e07808585c645bc82afd7487a91390f5511", "tree": "f8585ff6fdd6dcae6a08f13017cc1fc1a1b11ea7", "parents": [ "f4b4718b61d1d5a7442a4fd6863ea80c3a10e508", "13411ddd319057ae334a4084ebcf2c741b317f34" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 29 12:03:56 2014 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 29 12:03:56 2014 +1000" }, "message": "Merge tag \u0027drm/for-3.14-rc1-20140123\u0027 of git://anongit.freedesktop.org/tegra/linux into drm-next\n\ndrm/tegra: Changes for v3.14-rc1 (update)\n\nThese patches fix some issues caused by the DRM panel support from the\nprevious pull request and add two more panels (for the Toshiba AC100 as\nwell as the Seaboard and Ventana).\n\n* tag \u0027drm/for-3.14-rc1-20140123\u0027 of git://anongit.freedesktop.org/tegra/linux:\n drm/tegra: Obtain head number from DT\n drm/panel: update EDID BLOB in panel_simple_get_modes()\n gpu: host1x: Remove unnecessary include\n drm/tegra: Use proper data type\n drm/tegra: Clarify how panel modes override others\n drm/tegra: Fix possible CRTC mask for RGB outputs\n drm/i915: Use drm_encoder_crtc_ok()\n drm: Move drm_encoder_crtc_ok() to core\n drm: provide a helper for the encoder possible_crtcs mask\n drm/tegra: Don\u0027t check resource with devm_ioremap_resource()\n drm/panel: Add support for Chunghwa CLAA101WA01A panel\n drm/panel: Add support for Samsung LTN101NT05 panel\n" }, { "commit": "f4b4718b61d1d5a7442a4fd6863ea80c3a10e508", "tree": "315751b7a57c6b2e953b1013a58c1104fb2e6ca2", "parents": [ "821b4db3b62139d51cf14090dfab07fb09cb3a6b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 24 09:50:18 2014 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 29 10:51:52 2014 +1000" }, "message": "drm: ast,cirrus,mgag200: use drm_can_sleep\n\nthese 3 were checking in_interrupt but we have situations where\ncalling vunmap under this could cause a BUG to be hit in\nsmp_call_function_many. Use the drm_can_sleep macro instead,\nwhich should stop this path from been taken in this case.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "821b4db3b62139d51cf14090dfab07fb09cb3a6b" }