)]}' { "log": [ { "commit": "9d3cae26acb471d5954cfdc25d1438b32060babe", "tree": "77e93b6fb207438f7f1f30a201cc86bc5b0ec82b", "parents": [ "df24eef3e794afbac69a377d1d2e2e3f5869f67a", "8520e443aa56cc157b015205ea53e7b9fc831291" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 23 17:09:55 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 23 17:09:55 2013 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc updates from Benjamin Herrenschmidt:\n \"So from the depth of frozen Minnesota, here\u0027s the powerpc pull request\n for 3.9. It has a few interesting highlights, in addition to the\n usual bunch of bug fixes, minor updates, embedded device tree updates\n and new boards:\n\n - Hand tuned asm implementation of SHA1 (by Paulus \u0026 Michael\n Ellerman)\n\n - Support for Doorbell interrupts on Power8 (kind of fast\n thread-thread IPIs) by Ian Munsie\n\n - Long overdue cleanup of the way we handle relocation of our open\n firmware trampoline (prom_init.c) on 64-bit by Anton Blanchard\n\n - Support for saving/restoring \u0026 context switching the PPR (Processor\n Priority Register) on server processors that support it. This\n allows the kernel to preserve thread priorities established by\n userspace. By Haren Myneni.\n\n - DAWR (new watchpoint facility) support on Power8 by Michael Neuling\n\n - Ability to change the DSCR (Data Stream Control Register) which\n controls cache prefetching on a running process via ptrace by\n Alexey Kardashevskiy\n\n - Support for context switching the TAR register on Power8 (new\n branch target register meant to be used by some new specific\n userspace perf event interrupt facility which is yet to be enabled)\n by Ian Munsie.\n\n - Improve preservation of the CFAR register (which captures the\n origin of a branch) on various exception conditions by Paulus.\n\n - Move the Bestcomm DMA driver from arch powerpc to drivers/dma where\n it belongs by Philippe De Muyter\n\n - Support for Transactional Memory on Power8 by Michael Neuling\n (based on original work by Matt Evans). For those curious about\n the feature, the patch contains a pretty good description.\"\n\n(See commit db8ff907027b: \"powerpc: Documentation for transactional\nmemory on powerpc\" for the mentioned description added to the file\nDocumentation/powerpc/transactional_memory.txt)\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (140 commits)\n powerpc/kexec: Disable hard IRQ before kexec\n powerpc/85xx: l2sram - Add compatible string for BSC9131 platform\n powerpc/85xx: bsc9131 - Correct typo in SDHC device node\n powerpc/e500/qemu-e500: enable coreint\n powerpc/mpic: allow coreint to be determined by MPIC version\n powerpc/fsl_pci: Store the pci ctlr device ptr in the pci ctlr struct\n powerpc/85xx: Board support for ppa8548\n powerpc/fsl: remove extraneous DIU platform functions\n arch/powerpc/platforms/85xx/p1022_ds.c: adjust duplicate test\n powerpc: Documentation for transactional memory on powerpc\n powerpc: Add transactional memory to pseries and ppc64 defconfigs\n powerpc: Add config option for transactional memory\n powerpc: Add transactional memory to POWER8 cpu features\n powerpc: Add new transactional memory state to the signal context\n powerpc: Hook in new transactional memory code\n powerpc: Routines for FP/VSX/VMX unavailable during a transaction\n powerpc: Add transactional memory unavaliable execption handler\n powerpc: Add reclaim and recheckpoint functions for context switching transactional memory processes\n powerpc: Add FP/VSX and VMX register load functions for transactional memory\n powerpc: Add helper functions for transactional memory context switching\n ...\n" }, { "commit": "80ec213592f568721315287c779004f6c715c7a8", "tree": "f5d667d0a7b415569042e7f085b5782e71b7dedc", "parents": [ "5e0b080d487d5e1f6e7b82d04d35af76bbd58ea8" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Wed Jan 16 18:53:42 2013 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Jan 21 14:52:44 2013 -0800" }, "message": "drivers/macintosh: remove depends on CONFIG_EXPERIMENTAL\n\nThe CONFIG_EXPERIMENTAL config item has not carried much meaning for a\nwhile now and is almost always enabled by default. As agreed during the\nLinux kernel summit, remove it from any \"depends on\" lines in Kconfigs.\n\nCC: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c7c360eedb8c1eea302a224a8c83d19a4e4cf608", "tree": "cb979c49278a8ede23a411be75fd3bd4df7369ab", "parents": [ "e253ebab935693cc2eafbc93e94b68b47dc779db" ], "author": { "name": "Wei Yongjun", "email": "yongjun_wei@trendmicro.com.cn", "time": "Sun Dec 02 03:00:09 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jan 10 17:00:36 2013 +1100" }, "message": "powerpc/windfarm: Use for_each_node_by_type() macro\n\nUse for_each_node_by_type() macro instead of open coding it.\n\nSigned-off-by: Wei Yongjun \u003cyongjun_wei@trendmicro.com.cn\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1da42fb6bf6fcddfa8981df0cf63b67c745778a6", "tree": "df12295709835724e62ea1ceed39f86da4aed243", "parents": [ "612b95cd7926d1a583e68f12e10b44b7ac80ca17" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Dec 21 15:03:50 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jan 03 15:57:14 2013 -0800" }, "message": "Drivers: macintosh: remove __dev* attributes.\n\nCONFIG_HOTPLUG is going away as an option. As a result, the __dev*\nmarkings need to be removed.\n\nThis change removes the use of __devinit, __devexit_p, __devinitconst,\nand __devexit from these drivers.\n\nBased on patches originally written by Bill Pemberton, but redone by me\nin order to handle some of the coding style issues better, by hand.\n\nCc: Bill Pemberton \u003cwfp5p@virginia.edu\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "16e024f30ce96ef5fa651e2914e19d175a924cab", "tree": "d68106151a0b36e22625d7af7b23081a48c92e87", "parents": [ "c36e0501ee91d7616a188efbf9714b1fce150032", "376bddd34433065aeb9b9a140870537feecf90ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 18 09:58:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 18 09:58:09 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc update from Benjamin Herrenschmidt:\n \"The main highlight is probably some base POWER8 support. There\u0027s more\n to come such as transactional memory support but that will wait for\n the next one.\n\n Overall it\u0027s pretty quiet, or rather I\u0027ve been pretty poor at picking\n things up from patchwork and reviewing them this time around and Kumar\n no better on the FSL side it seems...\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (73 commits)\n powerpc+of: Rename and fix OF reconfig notifier error inject module\n powerpc: mpc5200: Add a3m071 board support\n powerpc/512x: don\u0027t compile any platform DIU code if the DIU is not enabled\n powerpc/mpc52xx: use module_platform_driver macro\n powerpc+of: Export of_reconfig_notifier_[register,unregister]\n powerpc/dma/raidengine: add raidengine device\n powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct\n powerpc/mpc85xx: Change spin table to cached memory\n powerpc/fsl-pci: Add PCI controller ATMU PM support\n powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI\n drivers/virt: the Freescale hypervisor driver doesn\u0027t need to check MSR[GS]\n powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers\n powerpc: Disable relocation on exceptions when kexecing\n powerpc: Enable relocation on during exceptions at boot\n powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function\n powerpc: Add wrappers to enable/disable relocation on exceptions\n powerpc: Add set_mode hcall\n powerpc: Setup relocation on exceptions for bare metal systems\n powerpc: Move initial mfspr LPCR out of __init_LPCR\n powerpc: Add relocation on exception vector handlers\n ...\n" }, { "commit": "81df9bff2609f07cef4690ac2ebda1611b55b05a", "tree": "52c5ebc7e9e5efd93040cba5f0439e043eec368e", "parents": [ "e9b2e78c6a4247b1bb3e89c61e7d73636d2e48d1" ], "author": { "name": "Joonsoo Kim", "email": "js1304@gmail.com", "time": "Tue Dec 11 16:03:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:28 2012 -0800" }, "message": "bootmem: fix wrong call parameter for free_bootmem()\n\nIt is strange that alloc_bootmem() returns a virtual address and\nfree_bootmem() requires a physical address. Anyway, free_bootmem()\u0027s\nfirst parameter should be physical address.\n\nThere are some call sites for free_bootmem() with virtual address. So fix\nthem.\n\n[akpm@linux-foundation.org: improve free_bootmem() and free_bootmem_pate() documentation]\nSigned-off-by: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de1bb03af7f4dde8e0e823629909d179fed4beff", "tree": "4ea86f8e160b8ea5c9689883c7f7da1536f5294b", "parents": [ "11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8", "f459d63e1689b16a2f5a965557e19b25bad5dbdc" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Nov 15 15:02:44 2012 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Nov 15 15:02:44 2012 +1100" }, "message": "Merge branch \u0027dt\u0027 into next\n" }, { "commit": "f7fb862b843269d02a2fa75e4bbb49603f801b88", "tree": "d3aa21750976a1fe81f0d91e6e1497d540a470a3", "parents": [ "0dc3289c797ef9558af566802429212e0b58a5d9" ], "author": { "name": "Wei Yongjun", "email": "yongjun_wei@trendmicro.com.cn", "time": "Mon Oct 08 03:00:04 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Nov 15 12:59:30 2012 +1100" }, "message": "powerpc/windfarm: Use module_i2c_driver to simplify the code\n\nUse the module_i2c_driver() macro to make the code smaller\nand a bit simpler.\n\ndpatch engine is used to auto generate this patch.\n(https://github.com/weiyj/dpatch)\n\nSigned-off-by: Wei Yongjun \u003cyongjun_wei@trendmicro.com.cn\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "79d1c712958f94372482ad74578b00f44e744c12", "tree": "ed26a9e56c56502c6f30496e7cbc367b54d950e7", "parents": [ "1cf3d8b3d24cd383ddfd5442c83ec5c355ffc2f7" ], "author": { "name": "Nathan Fontenot", "email": "nfont@linux.vnet.ibm.com", "time": "Tue Oct 02 16:58:46 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Nov 15 12:56:52 2012 +1100" }, "message": "powerpc+of: Rename the drivers/of prom_* functions to of_*\n\nRename the prom_*_property routines of the generic OF code to of_*_property.\nThis brings them in line with the naming used by the rest of the OF code.\n\nSigned-off-by: Nathan Fontenot \u003cnfont@linux.vnet.ibm.com\u003e\nAcked-by: Geoff Levand \u003cgeoff@infradead.org\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "5f3d2f2e1a63679cf1c4a4210f2f1cc2f335bef6", "tree": "9189bd6c81fe5f982a7ae45d2f3d900176658509", "parents": [ "283dbd82055eb70ff3b469f812d9c695f18c9641", "d900bd7366463fd96a907b2c212242e2b68b27d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:16:12 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:16:12 2012 +0900" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc updates from Benjamin Herrenschmidt:\n \"Some highlights in addition to the usual batch of fixes:\n\n - 64TB address space support for 64-bit processes by Aneesh Kumar\n\n - Gavin Shan did a major cleanup \u0026 re-organization of our EEH support\n code (IBM fancy PCI error handling \u0026 recovery infrastructure) which\n paves the way for supporting different platform backends, along\n with some rework of the PCIe code for the PowerNV platform in order\n to remove home made resource allocations and instead use the\n generic code (which is possible after some small improvements to it\n done by Gavin).\n\n - Uprobes support by Ananth N Mavinakayanahalli\n\n - A pile of embedded updates from Freescale folks, including new SoC\n and board supports, more KVM stuff including preparing for 64-bit\n BookE KVM support, ePAPR 1.1 updates, etc...\"\n\nFixup trivial conflicts in drivers/scsi/ipr.c\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)\n powerpc/iommu: Fix multiple issues with IOMMU pools code\n powerpc: Fix VMX fix for memcpy case\n driver/mtd:IFC NAND:Initialise internal SRAM before any write\n powerpc/fsl-pci: use \u0027Header Type\u0027 to identify PCIE mode\n powerpc/eeh: Don\u0027t release eeh_mutex in eeh_phb_pe_get\n powerpc: Remove tlb batching hack for nighthawk\n powerpc: Set paca-\u003edata_offset \u003d 0 for boot cpu\n powerpc/perf: Sample only if SIAR-Valid bit is set in P7+\n powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled\n powerpc/mpc85xx: Update interrupt handling for IFC controller\n powerpc/85xx: Enable USB support in p1023rds_defconfig\n powerpc/smp: Do not disable IPI interrupts during suspend\n powerpc/eeh: Fix crash on converting OF node to edev\n powerpc/eeh: Lock module while handling EEH event\n powerpc/kprobe: Don\u0027t emulate store when kprobe stwu r1\n powerpc/kprobe: Complete kprobe and migrate exception frame\n powerpc/kprobe: Introduce a new thread flag\n powerpc: Remove unused __get_user64() and __put_user64()\n powerpc/eeh: Global mutex to protect PE tree\n powerpc/eeh: Remove EEH PE for normal PCI hotplug\n ...\n" }, { "commit": "dd0e981a6cc855a785e43d743c399196c144cdd6", "tree": "9b78b1708fbb4af5118c37e7e262b3c942b9e596", "parents": [ "e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Oct 04 17:11:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:04:41 2012 +0900" }, "message": "sections: fix section conflicts in drivers/macintosh\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "033d9959ed2dc1029217d4165f80a71702dc578e", "tree": "3d306316e44bdabce2e0bf2ef7e466e525f90b4c", "parents": [ "974a847e00cf3ff1695e62b276892137893706ab", "7c6e72e46c9ea4a88f3f8ba96edce9db4bd48726" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 09:54:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 09:54:49 2012 -0700" }, "message": "Merge branch \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue changes from Tejun Heo:\n \"This is workqueue updates for v3.7-rc1. A lot of activities this\n round including considerable API and behavior cleanups.\n\n * delayed_work combines a timer and a work item. The handling of the\n timer part has always been a bit clunky leading to confusing\n cancelation API with weird corner-case behaviors. delayed_work is\n updated to use new IRQ safe timer and cancelation now works as\n expected.\n\n * Another deficiency of delayed_work was lack of the counterpart of\n mod_timer() which led to cancel+queue combinations or open-coded\n timer+work usages. mod_delayed_work[_on]() are added.\n\n These two delayed_work changes make delayed_work provide interface\n and behave like timer which is executed with process context.\n\n * A work item could be executed concurrently on multiple CPUs, which\n is rather unintuitive and made flush_work() behavior confusing and\n half-broken under certain circumstances. This problem doesn\u0027t\n exist for non-reentrant workqueues. While non-reentrancy check\n isn\u0027t free, the overhead is incurred only when a work item bounces\n across different CPUs and even in simulated pathological scenario\n the overhead isn\u0027t too high.\n\n All workqueues are made non-reentrant. This removes the\n distinction between flush_[delayed_]work() and\n flush_[delayed_]_work_sync(). The former is now as strong as the\n latter and the specified work item is guaranteed to have finished\n execution of any previous queueing on return.\n\n * In addition to the various bug fixes, Lai redid and simplified CPU\n hotplug handling significantly.\n\n * Joonsoo introduced system_highpri_wq and used it during CPU\n hotplug.\n\n There are two merge commits - one to pull in IRQ safe timer from\n tip/timers/core and the other to pull in CPU hotplug fixes from\n wq/for-3.6-fixes as Lai\u0027s hotplug restructuring depended on them.\"\n\nFixed a number of trivial conflicts, but the more interesting conflicts\nwere silent ones where the deprecated interfaces had been used by new\ncode in the merge window, and thus didn\u0027t cause any real data conflicts.\n\nTejun pointed out a few of them, I fixed a couple more.\n\n* \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)\n workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()\n workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()\n workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()\n workqueue: remove @delayed from cwq_dec_nr_in_flight()\n workqueue: fix possible stall on try_to_grab_pending() of a delayed work item\n workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()\n workqueue: use __cpuinit instead of __devinit for cpu callbacks\n workqueue: rename manager_mutex to assoc_mutex\n workqueue: WORKER_REBIND is no longer necessary for idle rebinding\n workqueue: WORKER_REBIND is no longer necessary for busy rebinding\n workqueue: reimplement idle worker rebinding\n workqueue: deprecate __cancel_delayed_work()\n workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()\n workqueue: use mod_delayed_work() instead of __cancel + queue\n workqueue: use irqsafe timer for delayed_work\n workqueue: clean up delayed_work initializers and add missing one\n workqueue: make deferrable delayed_work initializer names consistent\n workqueue: cosmetic whitespace updates for macro definitions\n workqueue: deprecate system_nrt[_freezable]_wq\n workqueue: deprecate flush[_delayed]_work_sync()\n ...\n" }, { "commit": "306e352ab1b59335c56657f4d59cbe8edc040a8c", "tree": "5a0c6be0c3d224667cf74e6a0b6b61e02a1f9897", "parents": [ "1d10a65fde071fae939387348c309bd6c237d36e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jul 13 16:24:26 2012 +0000" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Tue Sep 11 08:57:43 2012 +0200" }, "message": "macintosh/mediabay: make data used as *of_device_id.data const\n\nSince of_device_id.data is declared as a pointer to const data a few\nmore consts can be added in this driver.\n\n[ukl: split Arnd\u0027s patch by driver]\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "519a6510981a98c199828df24d5d3619f6394985", "tree": "e11dd01c3d92f5dd520b0b49aa70f1a4ff376ec6", "parents": [ "efc9b736c4477df7ff3ce403bca66846d21458d5" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon May 21 21:57:39 2012 +0200" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Tue Sep 11 08:56:55 2012 +0200" }, "message": "macintosh/mediabay: add a const qualifier\n\nThis prepares *of_device_id.data becoming const. Without this change\nthe following warning would occur:\n\n\tdrivers/macintosh/mediabay.c: In function \u0027media_bay_attach\u0027:\n\tdrivers/macintosh/mediabay.c:589:11: warning: assignment discards \u0027const\u0027 qualifier from pointer target type [enabled by default]\n\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "48817c58066fe61d3dde100e2c0dd7054418ee92", "tree": "75aef70611b4ac74b3c4178580f459392a340508", "parents": [ "b4b8d1e48e05313b163a36946be1a82e5bc5f9ad" ], "author": { "name": "Michael Ellerman", "email": "michael@ellerman.id.au", "time": "Wed Jul 25 21:19:54 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Sep 05 15:18:45 2012 +1000" }, "message": "drivers/macintosh/smu.c: Replace abs_to_virt() with __va()\n\nabs_to_virt() is just a wrapper around __va(), call __va() directly.\n\nSigned-off-by: Michael Ellerman \u003cmichael@ellerman.id.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "43829731dd372d04d6706c51052b9dabab9ca356", "tree": "2cfa255dcec2f5cc867ab39cdcf4a25eae54845f", "parents": [ "ae930e0f4e66fd540c6fbad9f1e2a7743d8b9afe" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Aug 20 14:51:24 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Aug 20 14:51:24 2012 -0700" }, "message": "workqueue: deprecate flush[_delayed]_work_sync()\n\nflush[_delayed]_work_sync() are now spurious. Mark them deprecated\nand convert all users to flush[_delayed]_work().\n\nIf you\u0027re cc\u0027d and wondering what\u0027s going on: Now all workqueues are\nnon-reentrant and the regular flushes guarantee that the work item is\nnot pending or running on any CPU on return, so there\u0027s no reason to\nuse the sync flushes at all and they\u0027re going away.\n\nThis patch doesn\u0027t make any functional difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Mattia Dongili \u003cmalattia@linux.it\u003e\nCc: Kent Yoder \u003ckey@linux.vnet.ibm.com\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Karsten Keil \u003cisdn@linux-pingi.de\u003e\nCc: Bryan Wu \u003cbryan.wu@canonical.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Alasdair Kergon \u003cagk@redhat.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: linux-wireless@vger.kernel.org\nCc: Anton Vorontsov \u003ccbou@mail.ru\u003e\nCc: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: \"James E.J. Bottomley\" \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\nCc: Petr Vandrovec \u003cpetr@vandrovec.name\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e \n" }, { "commit": "9525a08b30b1c8e39578938fc3420ac0b56f3a3d", "tree": "7ec620d4cbfa7817e53f982ead1d615cf3c6c1b3", "parents": [ "ea4e89afedc7fc64078076eacbcffaaa742baf0d" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue May 08 13:28:37 2012 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed May 09 10:58:21 2012 +1000" }, "message": "powerpc/windfarm: Fix crash on SMU based machine after i2c conversion\n\nWe no longer get the device node in platform_data but instead\nwhere it belongs in struct device, so get it from there instead\nof blowing up.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "43671cc96e58458b2711f1e97ff24a4c0e7cd1ac", "tree": "b470fccaad237c362b5fb94b068f1fd985633198", "parents": [ "ca7d593e0ac8cf806aa750815daf12594345f5f6" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed May 02 20:19:43 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu May 03 16:54:54 2012 +1000" }, "message": "powerpc/windfarm: don\u0027t pass const strings to snprintf\n\nFixes these build warnings:\n\ndrivers/macintosh/windfarm_smu_sat.c: In function \u0027wf_sat_probe\u0027:\ndrivers/macintosh/windfarm_smu_sat.c:290:3: warning: passing argument 1 of \u0027snprintf\u0027 discards qualifiers from pointer target type\ninclude/linux/kernel.h:323:5: note: expected \u0027char *\u0027 but argument is of type \u0027const char *\u0027\ndrivers/macintosh/windfarm_smu_sat.c:317:3: warning: passing argument 1 of \u0027snprintf\u0027 discards qualifiers from pointer target type\ninclude/linux/kernel.h:323:5: note: expected \u0027char *\u0027 but argument is of type \u0027const char *\u0027\n\nIntroduced by commit e074d08e2b98 (\"powerpc/windfarm: const\u0027ify and add\n\"priv\" field to controls \u0026 sensors\").\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "ca7d593e0ac8cf806aa750815daf12594345f5f6", "tree": "d632b011b732084260f10b144e91e9258555d780", "parents": [ "ec34a6814988f17506733c1e8b058ce46602591d" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed May 02 18:34:52 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu May 03 16:54:53 2012 +1000" }, "message": "powerpc/windfarm: fix compiler warning\n\nFixes this warning:\n\ndrivers/macintosh/windfarm_pm91.c: In function \u0027wf_smu_cpu_fans_tick\u0027:\ndrivers/macintosh/windfarm_pm91.c:237:2: warning: passing argument 1 of \u0027wf_sensor_get\u0027 from incompatible pointer type\ndrivers/macintosh/windfarm.h:124:19: note: expected \u0027struct wf_sensor *\u0027 but argument is of type \u0027struct wf_sensor **\u0027\n\nIntroduced by commit 33e6820b767a (\"powerpc/windfarm: Add useful\naccessors\").\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "6cd3209967469f6e89d329deda6bb0b4700e7b62", "tree": "35f099b364bf811b44fa11c7d71eaa7b22d264a1", "parents": [ "a78a4a03a75466ff859d989a1a00110ebd0165b0" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Sun Apr 29 15:42:27 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:25 2012 +1000" }, "message": "powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5\n\nThis replaces the old therm_pm72 using the same windfarm infrastructure\nthat was used for other PowerMac G5 models. The fan speeds and sensors\nshould now be visible in the same location in sysfs.\n\nThe driver is split into separate core modules for PowerMac7,2 (and 7,3)\nand RackMac3,1, with a lot of the shared code now in the separate sensor\nand control modules.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "a78a4a03a75466ff859d989a1a00110ebd0165b0", "tree": "af7748ecde199305ab493a32954f7163a4579914", "parents": [ "d839ba2ab2f3270fe4f067e082a7233ba06bcf9c" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:55 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:25 2012 +1000" }, "message": "powerpc/windfarm: Add Fan Control Unit controls for G5s\n\nThe FCU operates the fans on the earlier generation G5 machines,\nthis module will be used by upcoming windfarm drivers.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "d839ba2ab2f3270fe4f067e082a7233ba06bcf9c", "tree": "360a0de268a4469a05199609ff311b92b787f310", "parents": [ "08fe5bc75f8c43042963dee4f33c9c6cb7791b69" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:54 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:24 2012 +1000" }, "message": "powerpc/windfarm: Updates to lm75 and max6690 sensors\n\nThis allows those modules to load on PowerMac7,2 PowerMac7,3\nand RackMac3,1 and add the sensor name conversion for those\nmachines.\n\nThis will be used by the corresponding new windfarm modules\nfor those machines.\n\nNote that since therm_pm72 is linked first, it will still\ntake priority on those i2c devices if built-in. If using modules\nit will depend which is loaded first, but you should avoid building\ntherm_pm72 if you are using the new windfarm drivers\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "08fe5bc75f8c43042963dee4f33c9c6cb7791b69", "tree": "6978a34f299c5b87d60f884c3083b248ffd666f1", "parents": [ "850dc32168a9efad1e5fff885eb80db730ca6aa9" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:53 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:21 2012 +1000" }, "message": "powerpc/windfarm: Add lm87 sensor\n\nFor use by the upcoming windfarm_rm31\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "850dc32168a9efad1e5fff885eb80db730ca6aa9", "tree": "dcf9d02f5697b30e317a09a946ad3195b15d8d75", "parents": [ "33e6820b767a5bfa4a0d579da6ee4568a2b1e730" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:52 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:21 2012 +1000" }, "message": "powerpc/windfarm: Add ad7417 sensor\n\nFor user by the upcoming windfarm_pm72 and windfarm_rm31\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "33e6820b767a5bfa4a0d579da6ee4568a2b1e730", "tree": "341a29222e9fb18fe4ce6f9c9346bbc4190584e3", "parents": [ "ea5c64b06743b505e0eb4e6caa1810fe685c9559" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:51 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:20 2012 +1000" }, "message": "powerpc/windfarm: Add useful accessors\n\nMakes the code more readable\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "ea5c64b06743b505e0eb4e6caa1810fe685c9559", "tree": "61d98ccdc6a509424242457888ecd1102e20fca0", "parents": [ "a94d72b13642364e4d9da6e9165da05c0e055507" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:50 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:20 2012 +1000" }, "message": "powerpc/windfarm: Improve display of fan speeds in sysfs\n\nControls registered as RPM and PWM fans are now displayed\nwith the \"RPM\" or \"%\" suffix respectively to make it\nclearer to the user what the value actually means since\nthe fan type isn\u0027t otherwise obvious.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "a94d72b13642364e4d9da6e9165da05c0e055507", "tree": "f85b78d1a721b305ceb5ceb80662428abede5c81", "parents": [ "e074d08e2b98db1b19328bb9395052b34366831d" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:49 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:20 2012 +1000" }, "message": "powerpc/windfarm: Remove spurrious sysfs_attr_init()\n\nThe windfarm core will do it, so this is a duplicate.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e074d08e2b98db1b19328bb9395052b34366831d", "tree": "113e1938321b9d98e1d8ea97fb2fbc34408d1177", "parents": [ "e326b30fda9a985a2e7fda6fb9212b86bf025c39" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:47 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:19 2012 +1000" }, "message": "powerpc/windfarm: const\u0027ify and add \"priv\" field to controls \u0026 sensors\n\nconst\u0027ify the sensor ops and name and add a void* for use by\nthe control and sensor drivers to point back to their private\ndata, avoiding the need to create a wrapper data structure\nper sensor or control instance.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e326b30fda9a985a2e7fda6fb9212b86bf025c39", "tree": "a72930b7ffe88e558d3fd4fdb00db2ccf9169adb", "parents": [ "22b6d2ea355449fc2a9a4dc5c346615af86b876e" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:46 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:19 2012 +1000" }, "message": "powerpc/pmac: Convert windfarm_smu_sat to new i2c probing\n\nThis simplifies the driver to stop using the deprecated attach interface.\n\nWhile at it we also implement teardown properly and fix the refcounting\nby using a kref.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "22b6d2ea355449fc2a9a4dc5c346615af86b876e", "tree": "d622b6d8ce1323ac5e1c298070c312baccfd6a32", "parents": [ "5400480f5411aab31939747371c6690a02ee7780" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:45 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:18 2012 +1000" }, "message": "powerpc/pmac: Convert windfarm_max6690 to new i2c probing\n\nThis simplifies the driver to stop using the deprecated attach interface\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "5400480f5411aab31939747371c6690a02ee7780", "tree": "4fa927215a522c96abe0d1d44f0431474211edcc", "parents": [ "7a4b15cdf3d607152ba23fa4aa2bf072c6810924" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:44 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:18 2012 +1000" }, "message": "powerpc/pmac: Convert windfarm_lm75 to new i2c probing\n\nThis simplifies the driver to stop using the deprecated attach interface\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "7a4b15cdf3d607152ba23fa4aa2bf072c6810924", "tree": "a2ba6283fa676a52a0ca3b35c7ec0e3dd9bdc27d", "parents": [ "81e5d8646ff6bf323dddcf172aa3cef84468fa12" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:43 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:18 2012 +1000" }, "message": "powerpc/pmac: Convert therm_adt746x to new i2c probing\n\nThis simplifies the driver to stop using the deprecated attach interface,\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "81e5d8646ff6bf323dddcf172aa3cef84468fa12", "tree": "acf9a3a4709118f4bb423d5887b1581546d8ae13", "parents": [ "35000870fcfbb28757ad47de77b4645072d916b8" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Apr 18 22:16:42 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 30 15:37:17 2012 +1000" }, "message": "i2c/powermac: Register i2c devices from device-tree\n\nThis causes i2c-powermac to register i2c devices exposed in the\ndevice-tree, enabling new-style probing of devices.\n\nNote that we prefix the IDs with \"MAC,\" in order to prevent the\ngeneric drivers from matching. This is done on purpose as we only\nwant drivers specifically tested/designed to operate on powermacs\nto match.\n\nThis removes the special case we had for the AMS driver, and updates\nthe driver\u0027s match table instead.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "f8974cb71310a05632aada76be6a27576d61e609", "tree": "c0b6f59333796c95aa2de9a2eb755e9b68599b71", "parents": [ "c207f3a43194e108dda43dc9a1ce507335cff6b9", "0f22dd395fc473cee252b9af50249b8e0f32fde7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:30:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:30:03 2012 -0700" }, "message": "Merge tag \u0027dt-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull core device tree changes for Linux v3.4 from Grant Likely:\n \"This branch contains a minor documentation addition, a utility\n function for parsing string properties needed by some of the new ARM\n platforms, disables dynamic DT code that isn\u0027t used anywhere but on a\n few PPC machines, and exports DT node compatible data to userspace via\n UEVENT properties. Nothing earth shattering here.\"\n\n* tag \u0027dt-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of: Only compile OF_DYNAMIC on PowerPC pseries and iseries\n arm/dts: OMAP3: Add omap3evm and am335xevm support\n drivercore: Output common devicetree information in uevent\n of: Add of_property_match_string() to find index into a string list\n" }, { "commit": "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "tree": "7211df5704b743a7667159748c670a9744164482", "parents": [ "d464c92b5234227c1698862a1906827e2e398ae0", "f1f996b66cc3908a8f5ffccc2ff41840e92f3b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree from Jiri Kosina:\n \"It\u0027s indeed trivial -- mostly documentation updates and a bunch of\n typo fixes from Masanari.\n\n There are also several linux/version.h include removals from Jesper.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)\n kcore: fix spelling in read_kcore() comment\n constify struct pci_dev * in obvious cases\n Revert \"char: Fix typo in viotape.c\"\n init: fix wording error in mm_init comment\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n Revert \"power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c\"\n writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header\n writeback: fix typo in the writeback_control comment\n Documentation: Fix multiple typo in Documentation\n tpm_tis: fix tis_lock with respect to RCU\n Revert \"media: Fix typo in mixer_drv.c and hdmi_drv.c\"\n Doc: Update numastat.txt\n qla4xxx: Add missing spaces to error messages\n compiler.h: Fix typo\n security: struct security_operations kerneldoc fix\n Documentation: broken URL in libata.tmpl\n Documentation: broken URL in filesystems.tmpl\n mtd: simplify return logic in do_map_probe()\n mm: fix comment typo of truncate_inode_pages_range\n power: bq27x00: Fix typos in comment\n ...\n" }, { "commit": "64f8c13561fbd2f1a8b4a8975b2aee73b561093e", "tree": "96a397f590a064de9987ff1144a293fc2bf3602f", "parents": [ "54321242afe6fcf8b7e589bc21ecf832bc5a206a" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Fri Feb 03 14:35:59 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Feb 16 16:15:12 2012 +1100" }, "message": "powerpc/adb: Use set_current_state()\n\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "972c5ae961d6e5103e2b33d935cfa4145fd47140", "tree": "350b2a76b979ba8766c09838617df67ff330eca0", "parents": [ "5196d20305d5e30d871111d3a876cf067dd94255", "7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 03 23:12:42 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 03 23:13:05 2012 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply patch to a newer\ncode (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)\n" }, { "commit": "ec16f3df1320c7529c69d3a1e05dbcb50aac9402", "tree": "d14e417f1402ea27a984ddf600346e0cb057c65d", "parents": [ "64f3e70be63cf0006b7a332901015e6d04217a45" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Tue Jan 24 02:26:36 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 03 22:48:46 2012 +0100" }, "message": "macintosh: fix string typo in mediabay.c\n\nFix typo \"unsuported\" to \"unsupported\" in\ndrivers/machintosh/mediabay.c\n\nSigned-off-by: Masanari Iida\u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "07d57a32fb6eb2da017796e038682f817a4f685e", "tree": "4c7bb83cbda8db99ed91f575d8355c5b45b16cfb", "parents": [ "7aff0fe33033fc75b61446ba29d38b1b1354af9f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 01 11:22:22 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 01 14:26:30 2012 -0700" }, "message": "drivercore: Output common devicetree information in uevent\n\nWhen userspace needs to find a specific device, it currently isn\u0027t easy to\nresolve a /sys/devices/ path from a specific device tree node. Nor is it\neasy to obtain the compatible list for devices.\n\nThis patch generalizes the code that inserts OF_* values into the uevent\ndevice attribute so that any device that is attached to an OF node will\nhave that information exported to userspace. Without this patch only\nplatform devices and some powerpc-specific busses have access to this\ndata.\n\nThe original function also creates a MODALIAS property for the compatible\nlist, but that code has not been generalized into the common case because\nit has the potential to break module loading on a lot of bus types. Bus\ntypes are still responsible for their own MODALIAS properties.\n\nBoot tested on ARM and compile tested on PowerPC and SPARC.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Tobias Klauser \u003ctklauser@distanz.ch\u003e\nCc: Frederic Lambert \u003cfrdrc66@gmail.com\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Mark Brown \u003cbroonie@sirena.org.uk\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "90ab5ee94171b3e28de6bb42ee30b527014e0be7", "tree": "fcf89889f6e881f2b231d3d20287c08174ce4b54", "parents": [ "476bc0015bf09dad39d36a8b19f76f0c181d1ec9" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "message": "module_param: make bool parameters really bool (drivers \u0026 misc)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "edbaa603eb801655e80808a9cf3d3b622e8ac66b", "tree": "a0a0091fc1d17fea32d6d21e3ce13d228fba6325", "parents": [ "7239f65cf364180cdb100a4ed211b2a9f9a72119" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 16:26:03 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 16:26:03 2011 -0800" }, "message": "driver-core: remove sysdev.h usage.\n\nThe sysdev.h file should not be needed by any in-kernel code, so remove\nthe .h file from these random files that seem to still want to include\nit.\n\nThe sysdev code will be going away soon, so this include needs to be\nremoved no matter what.\n\nCc: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nCc: Scott Branden \u003csbranden@broadcom.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"Venkatesh Pallipadi\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\n" }, { "commit": "612ef28a045efadb3a98d4492ead7806a146485d", "tree": "05621c87b37e91c27b06d450d76adffe97ce9666", "parents": [ "c3e0ef9a298e028a82ada28101ccd5cf64d209ee", "07cde2608a3b5c66515363f1b53623b1536b9785" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon Dec 19 19:23:15 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon Dec 19 19:23:15 2011 +0100" }, "message": "Merge branch \u0027sched/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip\n\nConflicts:\n\tdrivers/cpufreq/cpufreq_conservative.c\n\tdrivers/cpufreq/cpufreq_ondemand.c\n\tdrivers/macintosh/rack-meter.c\n\tfs/proc/stat.c\n\tfs/proc/uptime.c\n\tkernel/sched/core.c\n" }, { "commit": "648616343cdbe904c585a6c12e323d3b3c72e46f", "tree": "514bce1b52663db4ab5662b637c764cf3c2ed1eb", "parents": [ "55b02d2f4445ad625213817a1736bf2884d32547" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Thu Dec 15 14:56:09 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Thu Dec 15 14:56:19 2011 +0100" }, "message": "[S390] cputime: add sparse checking and cleanup\n\nMake cputime_t and cputime64_t nocast to enable sparse checking to\ndetect incorrect use of cputime. Drop the cputime macros for simple\nscalar operations. The conversion macros are still needed.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "3292beb340c76884427faa1f5d6085719477d889", "tree": "cb7e431b2a15fa66ef5278d485131bac7a125fbd", "parents": [ "786d6dc7aeb2bfbfe417507b7beb83919f319db3" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Mon Nov 28 14:45:17 2011 -0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 06 09:06:38 2011 +0100" }, "message": "sched/accounting: Change cpustat fields to an array\n\nThis patch changes fields in cpustat from a structure, to an\nu64 array. Math gets easier, and the code is more flexible.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Tuner \u003cpjt@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1322498719-2255-2-git-send-email-glommer@parallels.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5a2394534b160ce18f9a705cf9de40e77648f8a2", "tree": "38d679c3633b4d2154ec68dbcc17ba2c207afb83", "parents": [ "1425df87c25b15400c9f26d57821bcfe01286b2a" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jul 13 22:33:13 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:48 2011 +0100" }, "message": "m68k/irq: Remove obsolete IRQ_FLG_* users\n\nThe m68k core irq code stopped honoring these flags during the irq\nrestructuring in 2006.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "22735068d53c7115e384bc88dea95b17e76a6839", "tree": "c531b0ca2ccf472c8abfede626535fcf07357624", "parents": [ "06222e491e663dac939f04b125c9dc52126a75c4" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jul 18 13:21:39 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 20 20:47:58 2011 -0400" }, "message": "drivers: fix up various -\u003ellseek() implementations\n\nFix up a few -\u003ellseek() implementations that won\u0027t deal with SEEK_HOLE/SEEK_DATA\nproperly. Make them future proof so that if we ever add new options they will\nreturn -EINVAL. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "57d19e80f459dd845fb3cfeba8e6df8471bac142", "tree": "8254766715720228db3d50f1ef3c7fe003c06d65", "parents": [ "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n b43: fix comment typo reqest -\u003e request\n Haavard Skinnemoen has left Atmel\n cris: typo in mach-fs Makefile\n Kconfig: fix copy/paste-ism for dell-wmi-aio driver\n doc: timers-howto: fix a typo (\"unsgined\")\n perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c\n md, raid5: Fix spelling error in comment (\u0027Ofcourse\u0027 --\u003e \u0027Of course\u0027).\n treewide: fix a few typos in comments\n regulator: change debug statement be consistent with the style of the rest\n Revert \"arm: mach-u300/gpio: Fix mem_region resource size miscalculations\"\n audit: acquire creds selectively to reduce atomic op overhead\n rtlwifi: don\u0027t touch with treewide double semicolon removal\n treewide: cleanup continuations and remove logging message whitespace\n ath9k_hw: don\u0027t touch with treewide double semicolon removal\n include/linux/leds-regulator.h: fix syntax in example code\n tty: fix typo in descripton of tty_termios_encode_baud_rate\n xtensa: remove obsolete BKL kernel option from defconfig\n m68k: fix comment typo \u0027occcured\u0027\n arch:Kconfig.locks Remove unused config option.\n treewide: remove extra semicolons\n ...\n" }, { "commit": "e83b906c99eb87a11cd731f6726e60cd8ac9ec4b", "tree": "31074cac87503e4d66e732ab9ca5ee2648ac8d39", "parents": [ "880102e78547c1db158a17e36cf0cdd98e7ad710" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 15:37:22 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 15:37:22 2011 +1000" }, "message": "powerpc/pmac: Update via-pmu to new syscore_ops\n\nThis was left as a sysdev, breaking the build\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "70f23fd66bc821a0e99647f70a809e277cc93c4c", "tree": "3e768b77e63c6364ef32cf257c9449369afd215f", "parents": [ "c719864f15676af92b705589c93ba1468b89cd24" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Tue May 10 10:16:21 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue May 10 10:16:21 2011 +0200" }, "message": "treewide: fix a few typos in comments\n\n- kenrel -\u003e kernel\n- whetehr -\u003e whether\n- ttt -\u003e tt\n- sss -\u003e ss\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "65e646ac509ff45e9f35e7fc1fea0d2b6723679f", "tree": "133fad23140d0b084f4150cf92eeb27971cfbff2", "parents": [ "62cc67b9df273be18fcb09a071592dedf751c90a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Mar 07 17:02:49 2011 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Apr 01 15:37:27 2011 +1100" }, "message": "powerpc/pmac: Rename cpu_state in therm_pm72 to avoid collision\n\nThis collides with the cpu_state in our SMP code, use processor_state\ninstead.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "bb7ca747f8d6243b3943c5b133048652020f4a50", "tree": "b40e879a7b26e3763aea2af2d4dd9079483de11e", "parents": [ "ccd7510fd8dea5b4b2af87fb2aef2ebd6b23b76b" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Tue Mar 22 16:30:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:43:59 2011 -0700" }, "message": "backlight: add backlight type\n\nThere may be multiple ways of controlling the backlight on a given\nmachine. Allow drivers to expose the type of interface they are\nproviding, making it possible for userspace to make appropriate policy\ndecisions.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nCc: Zhang Rui \u003crui.zhang@intel.com\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0a95d92c0054e74fb79607ac2df958b7bf295706", "tree": "e2c5f836e799dcfd72904949be47595af91432e7", "parents": [ "08351fc6a75731226e1112fc7254542bd3a2912e", "831532035b12a5f7b600515a6f4da0b207b82d6e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 06:31:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 06:31:43 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits)\n powerpc/85xx: Fix signedness bug in cache-sram\n powerpc/fsl: 85xx: document cache sram bindings\n powerpc/fsl: define binding for fsl mpic interrupt controllers\n powerpc/fsl_msi: Handle msi-available-ranges better\n drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak\n powerpc/85xx: Fix SPE float to integer conversion failure\n powerpc/85xx: Update sata controller compatible for p1022ds board\n ATA: Add FSL sata v2 controller support\n powerpc/mpc8xxx_gpio: simplify searching for \u0027fsl, qoriq-gpio\u0027 compatiable\n powerpc/8xx: remove obsolete mgsuvd board\n powerpc/82xx: rename and update mgcoge board support\n powerpc/83xx: rename and update kmeter1\n powerpc/85xx: Workaroudn e500 CPU erratum A005\n powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x\n powerpc/85xx: Fix writing to spin table \u0027cpu-release-addr\u0027 on ppc64e\n powerpc/pseries: Disable MSI using new interface if possible\n powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED.\n powerpc: core irq_data conversion.\n powerpc: sysdev/xilinx_intc irq_data conversion.\n powerpc: sysdev/uic irq_data conversion.\n ...\n\nFix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of\nof_platform_driver in arch/powerpc)\n" }, { "commit": "e1f4dea454c8e643644114757080680e1959d410", "tree": "b6dcb108460eade471637db1132e7890bbfda1a1", "parents": [ "fe3cc0d99de6a9bf99b6c279a8afb5833888c1f7" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 09:59:31 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Mar 02 16:50:25 2011 +1100" }, "message": "powerpc/macintosh: Fix __devexit annotation in rack-meter.c\n\nThe following warning was seen building rack-meter.c\n\nWARNING: drivers/built-in.o(.text+0xac784): Section mismatch in reference from the function rackmeter_shutdown() to the function .devexit.text:rackmeter_stop_cpu_sniffer()\nThe function rackmeter_shutdown() references a function in an exit section.\nOften the function rackmeter_stop_cpu_sniffer() has valid usage outside the exit section\nand the fix is to remove the __devexit annotation of rackmeter_stop_cpu_sniffer.\n\nThis patch resolves the warning by removing the __devexit annotation from\nrackmeter_stop_cpu_sniffer().\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: linuxppc-dev@lists.ozlabs.org\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "000061245a6797d542854106463b6b20fbdcb12e", "tree": "08ead444b59ce33cf533b19c1c6d338dcec4649d", "parents": [ "710ac54be44e0cc53f5bf29b03d12c8706e7077a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 22 19:59:54 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 01:36:39 2011 -0700" }, "message": "dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n\nGet rid of old users of of_platform_driver in arch/powerpc. Most\nof_platform_driver users can be converted to use the platform_bus\ndirectly.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n\n" }, { "commit": "f32be0c54057faac90e0b5e9e13fa9f8fab127ac", "tree": "4dc3e6c16b97dc79a0fc1b570cdf8394f75d001a", "parents": [ "4c4a5cf64bfa0ddbe4145e6ca18a62eb70706edd" ], "author": { "name": "roel kluin", "email": "roel.kluin@gmail.com", "time": "Fri Dec 31 04:57:46 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jan 21 14:08:34 2011 +1100" }, "message": "powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()\n\nFix error test in fan_{read,write}_reg()\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "5a62f995446be44811fefa48f91f9efb7ea172d7", "tree": "e297371f0d513dc6278bb67d582d2216eb7d74ed", "parents": [ "f1d6d6cd9029daa7e7d4a0b14347b5392320f22a", "5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:31:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:31:41 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)\n powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA\n powerpc/pseries: Fix VPHN build errors on non-SMP systems\n powerpc/83xx: add mpc8308_p1m DMA controller device-tree node\n powerpc/83xx: add DMA controller to mpc8308 device-tree node\n powerpc/512x: try to free dma descriptors in case of allocation failure\n powerpc/512x: add MPC8308 dma support\n powerpc/512x: fix the hanged dma transfer issue\n powerpc/512x: scatter/gather dma fix\n powerpc/powermac: Make auto-loading of therm_pm72 possible\n of/address: Use propper endianess in get_flags\n powerpc/pci: Use printf extension %pR for struct resource\n powerpc: Remove unnecessary casts of void ptr\n powerpc: Disable VPHN polling during a suspend operation\n powerpc/pseries: Poll VPA for topology changes and update NUMA maps\n powerpc: iommu: Add device name to iommu error printks\n powerpc: Record vma-\u003ephys_addr in ioremap()\n powerpc: Update compat_arch_ptrace\n powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S\n powerpc/time: printk time stamp init not correct\n powerpc: Minor cleanups for machdep.h\n ...\n" }, { "commit": "eed0ba0b4ab2d1668588219a8efa81bf8636a12d", "tree": "f5aa3c732e7830a1b24e6071f8bed0f799881187", "parents": [ "98b14d6b290d96b24ae993ceaccc59b2aa4b130c", "c9de9333f5a860cab82052bce6ac28bcac9b2c26" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jan 11 15:10:08 2011 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jan 11 15:10:08 2011 +1100" }, "message": "Merge remote branch \u0027gcl/next\u0027 into next\n" }, { "commit": "23d69b09b78c4876e134f104a3814c30747c53f1", "tree": "40744de4f4126c21027ce537264524095e0e7979", "parents": [ "e744070fd4ff9d3114277e52d77afa21579adce2", "569ff2de2e1c8ac67c8df3a7367d46d0d9460a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)\n usb: don\u0027t use flush_scheduled_work()\n speedtch: don\u0027t abuse struct delayed_work\n media/video: don\u0027t use flush_scheduled_work()\n media/video: explicitly flush request_module work\n ioc4: use static work_struct for ioc4_load_modules()\n init: don\u0027t call flush_scheduled_work() from do_initcalls()\n s390: don\u0027t use flush_scheduled_work()\n rtc: don\u0027t use flush_scheduled_work()\n mmc: update workqueue usages\n mfd: update workqueue usages\n dvb: don\u0027t use flush_scheduled_work()\n leds-wm8350: don\u0027t use flush_scheduled_work()\n mISDN: don\u0027t use flush_scheduled_work()\n macintosh/ams: don\u0027t use flush_scheduled_work()\n vmwgfx: don\u0027t use flush_scheduled_work()\n tpm: don\u0027t use flush_scheduled_work()\n sonypi: don\u0027t use flush_scheduled_work()\n hvsi: don\u0027t use flush_scheduled_work()\n xen: don\u0027t use flush_scheduled_work()\n gdrom: don\u0027t use flush_scheduled_work()\n ...\n\nFixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c\nas per Tejun.\n" }, { "commit": "31b6ca0af758a88e5e769b48cc6dde037ee37b96", "tree": "e1968d7168affb25e33e2be2d1d102f94af98af0", "parents": [ "56b85f32d530d09d6805488ad00775d4e0e3baab", "554738da71004d96e06fb75f4772dfc3b0f47810" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 14:45:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 14:45:47 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)\n Input: wacom_w8001 - support pen or touch only devices\n Input: wacom_w8001 - use __set_bit to set keybits\n Input: bu21013_ts - fix misuse of logical operation in place of bitop\n Input: i8042 - add Acer Aspire 5100 to the Dritek list\n Input: wacom - add support for digitizer in Lenovo W700\n Input: psmouse - disable the synaptics extension on OLPC machines\n Input: psmouse - fix up Synaptics comment\n Input: synaptics - ignore bogus mt packet\n Input: synaptics - add multi-finger and semi-mt support\n Input: synaptics - report clickpad property\n input: mt: Document interface updates\n Input: fix double equality sign in uevent\n Input: introduce device properties\n hid: egalax: Add support for Wetab (726b)\n Input: include MT library as source for kerneldoc\n MAINTAINERS: Update input-mt entry\n hid: egalax: Add support for Samsung NB30 netbook\n hid: egalax: Document the new devices in Kconfig\n hid: egalax: Add support for Wetab\n hid: egalax: Convert to MT slots\n ...\n\nFixed up trivial conflict in drivers/input/keyboard/Kconfig\n" }, { "commit": "d9c612eb6e9ccb8192e6c4d609dbbf178020c672", "tree": "6c10992888953d550bbedb169dc40e57806a6c67", "parents": [ "a6665944ef83b6a2db8fc5b323c9fca92375a643" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "message": "macintosh/ams: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is deprecated and scheduled to be removed.\nDirectly flush ams_info.worker on detach instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "4b7bd364700d9ac8372eff48832062b936d0793b", "tree": "0dbf78c95456a0b02d07fcd473281f04a87e266d", "parents": [ "c0d8768af260e2cbb4bf659ae6094a262c86b085", "90a8a73c06cc32b609a880d48449d7083327e11a" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mach-omap2/pm24xx.c\n\tdrivers/scsi/bfa/bfa_fcpim.c\n\nNeeded to update to apply fixes for which the old branch was too\noutdated.\n" }, { "commit": "afe2c511fb2d75f1515081ff1be15bd79cfe722d", "tree": "28aa74e9e0c654a95bf3306101e10ac1d16919d1", "parents": [ "2d64672ed38721b7a3815009d79bfb90a1f34a17" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Dec 14 16:21:17 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 15 10:56:11 2010 +0100" }, "message": "workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()\n\ncancel_rearming_delayed_work[queue]() has been superceded by\ncancel_delayed_work_sync() quite some time ago. Convert all the\nin-kernel users. The conversions are completely equivalent and\ntrivial.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Evgeniy Polyakov \u003czbr@ioremap.net\u003e\nCc: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: netdev@vger.kernel.org\nCc: Anton Vorontsov \u003ccbou@mail.ru\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Alex Elder \u003caelder@sgi.com\u003e\nCc: xfs-masters@oss.sgi.com\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: netfilter-devel@vger.kernel.org\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: linux-nfs@vger.kernel.org\n" }, { "commit": "98b14d6b290d96b24ae993ceaccc59b2aa4b130c", "tree": "cbf1655199e699411b0ca0e1b92b551cf37abf28", "parents": [ "982cf00412a890ca738c2d78528b652ca431ad1a" ], "author": { "name": "Marc Zyngier", "email": "maz@misterjones.org", "time": "Sun Dec 05 05:05:37 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Dec 09 15:36:30 2010 +1100" }, "message": "powerpc/powermac: Make auto-loading of therm_pm72 possible\n\nThe therm_pm72 driver, used on the PowerMac G5 range, cannot be\nauto-loaded, since the driver itself creates both the device node\nand the driver instance.\n\nMoving the device node creation to the platform setup code and\nadding the necessary MODULE_DEVICE_TABLE() information allows the\ndriver to be automatically loaded by udev on any semi-modern\ndistribution.\n\nIt \"fixes\" a major source of problem on G5 machines where the\ndriver wasn\u0027t explicitely loaded by default, and the system\nwould automatically shutdown under load.\n\nTested on an Xserve G5.\n\nSigned-off-by: Marc Zyngier \u003cmaz@misterjones.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "0bae35e14b68f5e7075bc96e5ea608b42bdf8f59", "tree": "c7aaf04160c9278d2d4f9466980dfca501258442", "parents": [ "e172662d113ceb22db727a979bb35b9c02f703b5" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Dec 02 14:31:14 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 14:51:15 2010 -0800" }, "message": "leds: fix up dependencies\n\nIt\u0027s not useful to build LED triggers when there\u0027s no LEDs that can be\ntriggered by them. Therefore, fix up the dependencies so that this\ncannot happen, and fix a few users that select triggers to depend on\nLEDS_CLASS as well (there is also one user that also selects LEDS_CLASS,\nwhich is OK).\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Arnd Hannemann \u003carnd@arndnet.de\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Richard Purdie \u003crpurdie@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f6aedd8606ae673f8e1f4d972fc86c451fbc8ba7", "tree": "c3f6316b887847c5e0a77d73a47237be4d15d562", "parents": [ "a8daac8a517dacfea951424f67c1f07e1f76b2ad" ], "author": { "name": "Nishanth Aravamudan", "email": "nacc@us.ibm.com", "time": "Tue Oct 26 17:35:11 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Nov 29 15:48:21 2010 +1100" }, "message": "powerpc/macio: Ensure all dma routines get copied over\n\nAlso add a comment to dev_archdata, indicating that changes there need\nto be verified against the driver code.\n\nSigned-off-by: Milton Miller \u003cmiltonm@bga.com\u003e\nSigned-off-by: Nishanth Aravamudan \u003cnacc@us.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "2f55ac072f5344519348c0c94b3d2f4cca46847b", "tree": "f3d544ab2812503b12a205b2515111a796638ffb", "parents": [ "acc2472ed33fc5e72482cc3b3b846077d97c2f8b" ], "author": { "name": "Lionel Debroux", "email": "lionel_debroux@yahoo.fr", "time": "Tue Nov 16 14:14:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Nov 16 14:14:02 2010 +0100" }, "message": "suspend: constify platform_suspend_ops\n\nWhile at it, fix two checkpatch errors.\nSeveral non-const struct instances constified by this patch were added after\nthe introduction of platform_suspend_ops in checkpatch.pl\u0027s list of \"should\nbe const\" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73).\n\nPatch against mainline.\nInspired by hunks of the grsecurity patch, updated for newer kernels.\n\nSigned-off-by: Lionel Debroux \u003clionel_debroux@yahoo.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "acc2472ed33fc5e72482cc3b3b846077d97c2f8b", "tree": "081b0693cce25cc85f11b613d096de91bdfb824b", "parents": [ "073ef1f6e508688392580e4f35dcad9aabd1e100" ], "author": { "name": "Lionel Debroux", "email": "lionel_debroux@yahoo.fr", "time": "Tue Nov 16 14:14:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Nov 16 14:14:02 2010 +0100" }, "message": "backlight: constify backlight_ops\n\nbacklight_device_register has been expecting a const \"ops\" argument, and using\nit as such, since 9905a43b2d563e6f89e4c63c4278ada03f2ebb14. Let\u0027s make the\nremaining backlight_ops instances const.\n\nInspired by hunks of the grsecurity patch, updated for newer kernels.\n\nSigned-off-by: Lionel Debroux \u003clionel_debroux@yahoo.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "38b7a2ae0ad3e29e1881b82c0f421ba5db148e3d", "tree": "e4c67965467ccaa4b31314de9844085ec8a5d3cb", "parents": [ "8818b6719f1ecfdc1f27761704d0c9e2cbc48250" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Nov 11 14:05:06 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 12 07:55:30 2010 -0800" }, "message": "drivers/macintosh/adb-iop.c: flags should be unsigned long\n\nFix these warnings:\n\n drivers/macintosh/adb-iop.c: In function `adb_iop_complete\u0027:\n drivers/macintosh/adb-iop.c:85: warning: comparison of distinct pointer types lacks a cast\n drivers/macintosh/adb-iop.c:92: warning: comparison of distinct pointer types lacks a cast\n drivers/macintosh/adb-iop.c: In function ¡adb_iop_listen¢:\n drivers/macintosh/adb-iop.c:111: warning: comparison of distinct pointer types lacks a cast\n drivers/macintosh/adb-iop.c:151: warning: comparison of distinct pointer types lacks a cast\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87abb6bbdbcfbced2ce0bcad68dd89ac3ff9464b", "tree": "fb272c8f41a094b46561d062a5aefdfd24084dac", "parents": [ "a309cdc778b9eece59b34e9e1c26e41476dbbcd6" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Nov 11 22:03:59 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Nov 11 22:22:19 2010 -0800" }, "message": "Input: mac mouse emulation - add locking\n\nWe need to add appropriate locking when toggling mac mouse emulation\non and off to ensure that input device and handler are in consistent\nstate.\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "bd5f47ec961594b1091839333600008f8166fd00", "tree": "aa4296edffd81e2976d20d3ea30ea18108b2a4de", "parents": [ "6dfee85397a47063291fe199eaf950bee7944454" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Oct 28 20:31:50 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Oct 28 20:31:50 2010 +0200" }, "message": "Move ams driver to macintosh\n\nThe ams driver isn\u0027t a hardware monitoring driver, so it shouldn\u0027t\nlive under driver/hwmon. drivers/macintosh seems much more\nappropriate, as the driver is only useful on PowerBooks and iBooks.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Stelian Pop \u003cstelian@popies.net\u003e\nCc: Michael Hanselmann \u003clinux-kernel@hansmi.ch\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "732eacc0542d0aa48797f675888b85d6065af837", "tree": "53205cea4b99cc8dfed8f59438cf4214ef6546ad", "parents": [ "f27c85c56b32c42bcc54a43189c1e00fdceb23ec" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Tue Oct 26 14:22:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:12 2010 -0700" }, "message": "replace nested max/min macros with {max,min}3 macro\n\nUse the new {max,min}3 macros to save some cycles and bytes on the stack.\nThis patch substitutes trivial nested macros with their counterpart.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Roland Dreier \u003crolandd@cisco.com\u003e\nCc: Sean Hefty \u003csean.hefty@intel.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "092e0e7e520a1fca03e13c9f2d157432a8657ff2", "tree": "451897252c4c08c4b5a8ef535da156f1e817e80b", "parents": [ "79f14b7c56d3b3ba58f8b43d1f70b9b71477a800", "776c163b1b93c8dfa5edba885bc2bfbc2d228a5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "message": "Merge branch \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n vfs: make no_llseek the default\n vfs: don\u0027t use BKL in default_llseek\n llseek: automatically add .llseek fop\n libfs: use generic_file_llseek for simple_attr\n mac80211: disallow seeks in minstrel debug code\n lirc: make chardev nonseekable\n viotape: use noop_llseek\n raw: use explicit llseek file operations\n ibmasmfs: use generic_file_llseek\n spufs: use llseek in all file operations\n arm/omap: use generic_file_llseek in iommu_debug\n lkdtm: use generic_file_llseek in debugfs\n net/wireless: use generic_file_llseek in debugfs\n drm: use noop_llseek\n" }, { "commit": "c37927d4359e81b85de644f8fb08878717cf5f3f", "tree": "25dabf2d905e1410819d1bdaba0bf5f779100d3c", "parents": [ "5704e44d283e907623e3775c1262f206a2c48cf3", "2a48fc0ab24241755dc93bfd4f01d68efab47f5a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:49:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:49:54 2010 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n block: autoconvert trivial BKL users to private mutex\n drivers: autoconvert trivial BKL users to private mutex\n ipmi: autoconvert trivial BKL users to private mutex\n mac: autoconvert trivial BKL users to private mutex\n mtd: autoconvert trivial BKL users to private mutex\n scsi: autoconvert trivial BKL users to private mutex\n\nFix up trivial conflicts (due to addition of private mutex right next to\ndeletion of a version string) in drivers/char/pcmcia/cm40[04]0_cs.c\n" }, { "commit": "d4429f608abde89e8bc1e24b43cd503feb95c496", "tree": "4c11afa193593a5e3949391bf35022b4f87ba375", "parents": [ "e10117d36ef758da0690c95ecffc09d5dd7da479", "6a1c9dfe4186f18fed38421b35b40fb9260cbfe1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 21:19:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 21:19:54 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)\n powerpc/44x: Update ppc44x_defconfig\n powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option\n fsl_rio: Add comments for sRIO registers.\n powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig\n powerpc/fsl-booke: Add p5020 DS board support\n powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips\n powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes\n powerpc/fsl-booke: Add support for FSL 64-bit e5500 core\n powerpc/85xx: add cache-sram support\n powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board\n powerpc: Fix compile error with paca code on ppc64e\n powerpc/fsl-booke: Add p3041 DS board support\n oprofile/fsl emb: Don\u0027t set MSR[PMM] until after clearing the interrupt.\n powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips\n powerpc/mpc8xxx_gpio: Add support for \u0027qoriq-gpio\u0027 controllers\n powerpc/fsl_booke: Add support to boot from core other than 0\n powerpc/p1022: Add probing for individual DMA channels\n powerpc/fsl_soc: Search all global-utilities nodes for rstccr\n powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT\n powerpc/mpc83xx: Support for MPC8308 P1M board\n ...\n\nFix up conflict with the generic irq_work changes in arch/powerpc/kernel/time.c\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6038f373a3dc1f1c26496e60b6c40b164716f07e", "tree": "a0d3bbd026eea41b9fc36b8c722cbaf56cd9f825", "parents": [ "1ec5584e3edf9c4bf2c88c846534d19cf986ba11" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Aug 15 18:52:59 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Oct 15 15:53:27 2010 +0200" }, "message": "llseek: automatically add .llseek fop\n\nAll file_operations should get a .llseek operation so we can make\nnonseekable_open the default for future file operations without a\n.llseek pointer.\n\nThe three cases that we can automatically detect are no_llseek, seq_lseek\nand default_llseek. For cases where we can we can automatically prove that\nthe file offset is always ignored, we use noop_llseek, which maintains\nthe current behavior of not returning an error from a seek.\n\nNew drivers should normally not use noop_llseek but instead use no_llseek\nand call nonseekable_open at open time. Existing drivers can be converted\nto do the same when the maintainer knows for certain that no user code\nrelies on calling seek on the device file.\n\nThe generated code is often incorrectly indented and right now contains\ncomments that clarify for each added line why a specific variant was\nchosen. In the version that gets submitted upstream, the comments will\nbe gone and I will manually fix the indentation, because there does not\nseem to be a way to do that using coccinelle.\n\nSome amount of new code is currently sitting in linux-next that should get\nthe same modifications, which I will do at the end of the merge window.\n\nMany thanks to Julia Lawall for helping me learn to write a semantic\npatch that does all this.\n\n\u003d\u003d\u003d\u003d\u003d begin semantic patch \u003d\u003d\u003d\u003d\u003d\n// This adds an llseek\u003d method to all file operations,\n// as a preparation for making no_llseek the default.\n//\n// The rules are\n// - use no_llseek explicitly if we do nonseekable_open\n// - use seq_lseek for sequential files\n// - use default_llseek if we know we access f_pos\n// - use noop_llseek if we know we don\u0027t access f_pos,\n// but we still want to allow users to call lseek\n//\n@ open1 exists @\nidentifier nested_open;\n@@\nnested_open(...)\n{\n\u003c+...\nnonseekable_open(...)\n...+\u003e\n}\n\n@ open exists@\nidentifier open_f;\nidentifier i, f;\nidentifier open1.nested_open;\n@@\nint open_f(struct inode *i, struct file *f)\n{\n\u003c+...\n(\nnonseekable_open(...)\n|\nnested_open(...)\n)\n...+\u003e\n}\n\n@ read disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ read_no_fpos disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ write @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ write_no_fpos @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ fops0 @\nidentifier fops;\n@@\nstruct file_operations fops \u003d {\n ...\n};\n\n@ has_llseek depends on fops0 @\nidentifier fops0.fops;\nidentifier llseek_f;\n@@\nstruct file_operations fops \u003d {\n...\n .llseek \u003d llseek_f,\n...\n};\n\n@ has_read depends on fops0 @\nidentifier fops0.fops;\nidentifier read_f;\n@@\nstruct file_operations fops \u003d {\n...\n .read \u003d read_f,\n...\n};\n\n@ has_write depends on fops0 @\nidentifier fops0.fops;\nidentifier write_f;\n@@\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n...\n};\n\n@ has_open depends on fops0 @\nidentifier fops0.fops;\nidentifier open_f;\n@@\nstruct file_operations fops \u003d {\n...\n .open \u003d open_f,\n...\n};\n\n// use no_llseek if we call nonseekable_open\n////////////////////////////////////////////\n@ nonseekable1 depends on !has_llseek \u0026\u0026 has_open @\nidentifier fops0.fops;\nidentifier nso ~\u003d \"nonseekable_open\";\n@@\nstruct file_operations fops \u003d {\n... .open \u003d nso, ...\n+.llseek \u003d no_llseek, /* nonseekable */\n};\n\n@ nonseekable2 depends on !has_llseek @\nidentifier fops0.fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n... .open \u003d open_f, ...\n+.llseek \u003d no_llseek, /* open uses nonseekable */\n};\n\n// use seq_lseek for sequential files\n/////////////////////////////////////\n@ seq depends on !has_llseek @\nidentifier fops0.fops;\nidentifier sr ~\u003d \"seq_read\";\n@@\nstruct file_operations fops \u003d {\n... .read \u003d sr, ...\n+.llseek \u003d seq_lseek, /* we have seq_read */\n};\n\n// use default_llseek if there is a readdir\n///////////////////////////////////////////\n@ fops1 depends on !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier readdir_e;\n@@\n// any other fop is used that changes pos\nstruct file_operations fops \u003d {\n... .readdir \u003d readdir_e, ...\n+.llseek \u003d default_llseek, /* readdir is present */\n};\n\n// use default_llseek if at least one of read/write touches f_pos\n/////////////////////////////////////////////////////////////////\n@ fops2 depends on !fops1 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read.read_f;\n@@\n// read fops use offset\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d default_llseek, /* read accesses f_pos */\n};\n\n@ fops3 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+\t.llseek \u003d default_llseek, /* write accesses f_pos */\n};\n\n// Use noop_llseek if neither read nor write accesses f_pos\n///////////////////////////////////////////////////////////\n\n@ fops4 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !fops3 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\nidentifier write_no_fpos.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n .read \u003d read_f,\n...\n+.llseek \u003d noop_llseek, /* read and write both use no f_pos */\n};\n\n@ depends on has_write \u0026\u0026 !has_read \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write_no_fpos.write_f;\n@@\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+.llseek \u003d noop_llseek, /* write uses no f_pos */\n};\n\n@ depends on has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\n@@\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d noop_llseek, /* read uses no f_pos */\n};\n\n@ depends on !has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\n@@\nstruct file_operations fops \u003d {\n...\n+.llseek \u003d noop_llseek, /* no read or write fn */\n};\n\u003d\u003d\u003d\u003d\u003d End semantic patch \u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\n" }, { "commit": "8192b1f6b1a46b33213b993471356495a93ffc70", "tree": "1cca30c90d176c295f68059943f891bc926b6d32", "parents": [ "a529f1505b6facfd0078dcb18a444976c1985962" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Sep 07 14:33:40 2010 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Oct 12 17:36:10 2010 +0200" }, "message": "drivers/macintosh/adb: Do not claim that the semaphore is a mutex\n\nUser DEFINE_SEMAPHORE() instead of DECLARE_MUTEX()\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nLKML-Reference: \u003c20100907125057.086367802@linutronix.de\u003e\n\n" }, { "commit": "d851b6e04ee978b0c1b187bee682592aa72f22ea", "tree": "1150757f61e3f4391d058fe2efc171e9fbcf13e2", "parents": [ "5aa82940b23d0c6e4083d48e387a16b8ad530a47" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Jun 02 14:28:52 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Sep 15 21:00:47 2010 +0200" }, "message": "mac: autoconvert trivial BKL users to private mutex\n\nAll these files use the big kernel lock in a trivial\nway to serialize their private file operations,\ntypically resulting from an earlier semi-automatic\npushdown from VFS.\n\nNone of these drivers appears to want to lock against\nother code, and they all use the BKL as the top-level\nlock in their file operations, meaning that there\nis no lock-order inversion problem.\n\nConsequently, we can remove the BKL completely,\nreplacing it with a per-file mutex in every case.\nUsing a scripted approach means we can avoid\ntypos.\n\nfile\u003d$1\nname\u003d$2\nif grep -q lock_kernel ${file} ; then\n if grep -q \u0027include.*linux.mutex.h\u0027 ${file} ; then\n sed -i \u0027/include.*\u003clinux\\/smp_lock.h\u003e/d\u0027 ${file}\n else\n sed -i \u0027s/include.*\u003clinux\\/smp_lock.h\u003e.*$/include \u003clinux\\/mutex.h\u003e/g\u0027 ${file}\n fi\n sed -i ${file} \\\n -e \"/^#include.*linux.mutex.h/,$ {\n 1,/^\\(static\\|int\\|long\\)/ {\n /^\\(static\\|int\\|long\\)/istatic DEFINE_MUTEX(${name}_mutex);\n\n} }\" \\\n -e \"s/\\(un\\)*lock_kernel\\\u003e[ ]*()/mutex_\\1lock(\\\u0026${name}_mutex)/g\" \\\n -e \u0027/[ ]*cycle_kernel_lock();/d\u0027\nelse\n sed -i -e \u0027/include.*\\\u003csmp_lock.h\\\u003e/d\u0027 ${file} \\\n -e \u0027/cycle_kernel_lock()/d\u0027\nfi\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: linuxppc-dev@ozlabs.org\n" }, { "commit": "1f7aac6eb585f92756603341cb1d770c797c4867", "tree": "f8e99e8c61f11e9a6e06ec821b0787671efb8ec9", "parents": [ "8fb07c0444c37caa39a8df7c70a694c6211f2f57" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat Aug 28 23:52:40 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Sep 02 14:07:33 2010 +1000" }, "message": "powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak\n\nAdd a call to of_node_put in the error handling code following a call to\nof_find_node_by_path.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nlocal idexpression x;\nexpression E,E1;\nstatement S;\n@@\n\n*x \u003d\n(of_find_node_by_path\n|of_find_node_by_name\n|of_find_node_by_phandle\n|of_get_parent\n|of_get_next_parent\n|of_get_next_child\n|of_find_compatible_node\n|of_match_node\n)(...);\n...\nif (x \u003d\u003d NULL) S\n\u003c... when !\u003d x \u003d E\n*if (...) {\n ... when !\u003d of_node_put(x)\n when !\u003d if (...) { ... of_node_put(x); ... }\n(\n return \u003c+...x...+\u003e;\n|\n* return ...;\n)\n}\n...\u003e\nof_node_put(x);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "4cc4587fb14bb04fbc68096cc3780b4e6aa88fe7", "tree": "8ce2fc11b71dda7786b0978337fcdaca3d18e01c", "parents": [ "bcc30d37582b3822ae24712e894379ccd8298e8f" ], "author": { "name": "Andreas Schwab", "email": "schwab@linux-m68k.org", "time": "Sun Aug 22 06:23:17 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Aug 24 15:28:28 2010 +1000" }, "message": "via-pmu: Add compat_pmu_ioctl\n\nThe ioctls are actually compatible, but due to historical mistake the\nnumbers differ between 32bit and 64bit.\n\nSigned-off-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1c00650c233c404fadf9347329214d55283bd17a", "tree": "9de7cda2fe2e54411cc24ff3befd758c9cb9cd74", "parents": [ "26df0766a73a859bb93dc58e747c5028557a23fd", "7f528135da9704d67db1f727162024b078e1cd8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:06:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:06:29 2010 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: I2C bus multiplexer driver pca954x\n i2c: Multiplexed I2C bus core support\n i2c: Use a separate mutex for userspace client lists\n i2c: Make i2c_default_probe self-sufficient\n i2c: Drop dummy variable\n i2c: Move adapter locking helpers to i2c-core\n V4L/DVB: Use custom I2C probing function mechanism\n i2c: Add support for custom probe function\n i2c-dev: Use memdup_user\n i2c-dev: Remove unnecessary kmalloc casts\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "9a94241afcc9a481691a9c29b7460217925b59b8", "tree": "7f2d42935422a228686bcd8680dc97ff8a1005bc", "parents": [ "f1c2e33c295de423db5740647bfaa5e2ad139192" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:56 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:56 2010 +0200" }, "message": "i2c: Add support for custom probe function\n\nThe probe method used by i2c_new_probed_device() may not be suitable\nfor all cases. Let the caller provide its own, optional probe\nfunction.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "17879857821adad4e180c5d6457c3b8bbf1d0c0c", "tree": "28afa4b59847ca13b8d51a83fa04954916387de9", "parents": [ "b62ad9ab181a67207a4c8c373461b587c4861a68", "4877c737283813bdb4bebfa3168c1585f6e3a8ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:25:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:25:43 2010 -0700" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n xen: Do not suspend IPI IRQs.\n powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts\n ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt\n irq: Add new IRQ flag IRQF_NO_SUSPEND\n" }, { "commit": "2dc11581376829303b98eadb2de253bee065a56a", "tree": "dbce62559c822cd720d1819a50c488bfecdfa945", "parents": [ "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "message": "of/device: Replace struct of_device with struct platform_device\n\nof_device is just an alias for platform_device, so remove it entirely. Also\nreplace to_of_device() with to_platform_device() and update comment blocks.\n\nThis patch was initially generated from the following semantic patch, and then\nedited by hand to pick up the bits that coccinelle didn\u0027t catch.\n\n@@\n@@\n-struct of_device\n+struct platform_device\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nReviewed-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba461f094bab2dc09487816b9dfce845796b259d", "tree": "4e175680cef1d200b854d930f39f9ca5af4cbd6f", "parents": [ "2dd9320305416c171087d5347a6c908ae22c6be1" ], "author": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Thu Jul 29 11:16:34 2010 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jul 29 13:24:57 2010 +0200" }, "message": "powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts\n\nkw_i2c_irq and via_pmu_interrupt are not timer interrupts and\ntherefore should not use IRQF_TIMER. Use the recently introduced\nIRQF_NO_SUSPEND instead since that is the actual desired behaviour.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: linuxppc-dev@ozlabs.org\nCc: devicetree-discuss@lists.ozlabs.org\nLKML-Reference: \u003c1280398595-29708-3-git-send-email-ian.campbell@citrix.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "34a1c1e8c700f7cd849deb21193718a172722f8d", "tree": "8cb17243ca49acda328f3561d55b6d3d2f62f0d2", "parents": [ "dd27dcda37f0b1a3b674760fb411abc5c8fe309c" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 08 07:48:13 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 05 16:14:28 2010 -0600" }, "message": "of: Modify of_device_get_modalias to be passed struct device\n\nNow that the of_node pointer is part of struct device,\nof_device_get_modalias could be used on any struct device\nthat has the device node pointer set. This patch changes\nof_device_get_modalias to accept a struct device instead\nof a struct of_device.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCC: Michal Simek \u003cmonstr@monstr.eu\u003e\nCC: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCC: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCC: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCC: microblaze-uclinux@itee.uq.edu.au\nCC: linuxppc-dev@ozlabs.org\n" }, { "commit": "39059cceeda478cd040d521b9541d1113035c908", "tree": "56adf04d6766a4346160aacd709468e5b2f1b879", "parents": [ "b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2", "c2cdf6aba0dfcfb54be646ab630c1bccd180e890" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/macio: Fix probing of macio devices by using the right of match table\n agp/uninorth: Fix oops caused by flushing too much\n powerpc/pasemi: Update MAINTAINERS file\n powerpc/cell: Fix integer constant warning\n powerpc/kprobes: Remove resume_execution() in kprobes\n powerpc/macio: Don\u0027t dereference pointer before null check\n" }, { "commit": "fbae3fb1546e199ab0cd185348f8124411a1ca9d", "tree": "928881dc419348268cbc8208a41fe0d038035114", "parents": [ "35bfc353dcaecc99c277e3646564f3f785760bde" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Thu Jun 03 11:33:58 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Jun 03 11:33:58 2010 +0200" }, "message": "i2c: Remove all i2c_set_clientdata(client, NULL) in drivers\n\nI2C drivers can use the clientdata-pointer to point to private data. As I2C\ndevices are not really unregistered, but merely detached from their driver, it\nused to be the drivers obligation to clear this pointer during remove() or a\nfailed probe(). As a couple of drivers forgot to do this, it was agreed that it\nwas cleaner if the i2c-core does this clearance when appropriate, as there is\nno guarantee for the lifetime of the clientdata-pointer after remove() anyhow.\nThis feature was added to the core with commit\ne4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers.\n\nAs there is no need anymore to clear the clientdata-pointer, remove all current\noccurrences in the drivers to simplify the code and prevent confusion.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "c2cdf6aba0dfcfb54be646ab630c1bccd180e890", "tree": "97bfd319f0ebe514ef821a080b74860fb9dbaa24", "parents": [ "79905ad50bcf025deb81382413719ed600734941" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:09:18 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:50:38 2010 +1000" }, "message": "powerpc/macio: Fix probing of macio devices by using the right of match table\n\nGrant patches added an of mach table to struct device_driver. However,\nwhile he changed the macio device code to use that, he left the match\ntable pointer in struct macio_driver and didn\u0027t update drivers to use\nthe \"new\" one, thus breaking the probing.\n\nThis completes the change by moving all drivers to setup the \"new\"\none, removing all traces of the old one, and while at it (since it\nchanges the exact same locations), I also remove two other duplicates\nfrom struct driver which are the name and owner fields.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "83aea945c21c646184a494a32ad5524248b60226", "tree": "c28239664bd321eb72da62d39b9ecf2d467e87b5", "parents": [ "aef4b9aaae1decc775778903922bd0075cce7a88" ], "author": { "name": "Andreas Schwab", "email": "schwab@linux-m68k.org", "time": "Tue Jun 01 05:58:40 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:50:36 2010 +1000" }, "message": "powerpc/macio: Don\u0027t dereference pointer before null check\n\nSigned-off-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "f13771187b9423b824f32518319f6da85d819003", "tree": "c431cf16c286065a302d5f3fb43fc1abac7e4047", "parents": [ "15953654cc312429740fd58fb37a5a3d63a54376", "9f37af654fda88a8dcca74c785f6c20e52758866" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "message": "Merge branch \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n uml: Pushdown the bkl from harddog_kern ioctl\n sunrpc: Pushdown the bkl from sunrpc cache ioctl\n sunrpc: Pushdown the bkl from ioctl\n autofs4: Pushdown the bkl from ioctl\n uml: Convert to unlocked_ioctls to remove implicit BKL\n ncpfs: BKL ioctl pushdown\n coda: Clean-up whitespace problems in pioctl.c\n coda: BKL ioctl pushdown\n drivers: Push down BKL into various drivers\n isdn: Push down BKL into ioctl functions\n scsi: Push down BKL into ioctl functions\n dvb: Push down BKL into ioctl functions\n smbfs: Push down BKL into ioctl function\n coda/psdev: Remove BKL from ioctl function\n um/mmapper: Remove BKL usage\n sn_hwperf: Kill BKL usage\n hfsplus: Push down BKL into ioctl function\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" } ], "next": "44504b2bebf8b5823c59484e73096a7d6574471d" }