)]}' { "log": [ { "commit": "da89fb165e5e51a2ec1ff8a0ff6bc052d1068184", "tree": "1f15b6177a886ceef83d60c3b5a7af926442f581", "parents": [ "d5adf235adc8d8d67c10afd43922c92753f6be3c", "b25b086d23eb852bf3cfdeb60409b4967ebb3c0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:37:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:37:26 2012 -0700" }, "message": "Merge tag \u0027tag-for-linus-3.5\u0027 of git://git.linaro.org/people/sumitsemwal/linux-dma-buf\n\nPull dma-buf updates from Sumit Semwal:\n \"Here\u0027s the first signed-tag pull request for dma-buf framework. It\n includes the following key items:\n - mmap support\n - vmap support\n - related documentation updates\n\n These are needed by various drivers to allow mmap/vmap of dma-buf\n shared buffers. Dave Airlie has some prime patches dependent on the\n vmap pull as well.\"\n\n* tag \u0027tag-for-linus-3.5\u0027 of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:\n dma-buf: add initial vmap documentation\n dma-buf: minor documentation fixes.\n dma-buf: add vmap interface\n dma-buf: mmap support\n" }, { "commit": "d5adf235adc8d8d67c10afd43922c92753f6be3c", "tree": "18c3cdcbc9a50a8cd00b03d83ec76bad7c7594f8", "parents": [ "d484864dd96e1830e7689510597707c1df8cd681", "1dd1ea8eb46a71201943148cc0ed3182cd04e288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:31:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:31:59 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine updates from Vinod Koul:\n \"Nothing exciting this time, odd fixes in a bunch of drivers\"\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dmaengine: at_hdmac: take maxburst from slave configuration\n dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant\n dmaengine: at_hdmac: remove some at_dma_slave comments\n dma: imx-sdma: make channel0 operations atomic\n dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful\n dmaengine: Use dma_sg_len(sg) instead of sg-\u003elength\n dmaengine: Use sg_dma_address instead of sg_phys\n DMA: PL330: Remove duplicate header file inclusion\n dma: imx-sdma: keep the callbacks invoked in the tasklet\n dmaengine: dw_dma: add Device Tree probing capability\n dmaengine: dw_dmac: Add clk_{un}prepare() support\n dma/amba-pl08x: add support for the Nomadik variant\n dma/amba-pl08x: check for terminal count status only\n" }, { "commit": "d484864dd96e1830e7689510597707c1df8cd681", "tree": "51551708ba3f26d05575fa91daaf0c0d970a77c3", "parents": [ "be87cfb47c5c740f7b17929bcd7c480b228513e0", "0f51596bd39a5c928307ffcffc9ba07f90f42a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull CMA and ARM DMA-mapping updates from Marek Szyprowski:\n \"These patches contain two major updates for DMA mapping subsystem\n (mainly for ARM architecture). First one is Contiguous Memory\n Allocator (CMA) which makes it possible for device drivers to allocate\n big contiguous chunks of memory after the system has booted.\n\n The main difference from the similar frameworks is the fact that CMA\n allows to transparently reuse the memory region reserved for the big\n chunk allocation as a system memory, so no memory is wasted when no\n big chunk is allocated. Once the alloc request is issued, the\n framework migrates system pages to create space for the required big\n chunk of physically contiguous memory.\n\n For more information one can refer to nice LWN articles:\n\n - \u0027A reworked contiguous memory allocator\u0027:\n\t\thttp://lwn.net/Articles/447405/\n\n - \u0027CMA and ARM\u0027:\n\t\thttp://lwn.net/Articles/450286/\n\n - \u0027A deep dive into CMA\u0027:\n\t\thttp://lwn.net/Articles/486301/\n\n - and the following thread with the patches and links to all previous\n versions:\n\t\thttps://lkml.org/lkml/2012/4/3/204\n\n The main client for this new framework is ARM DMA-mapping subsystem.\n\n The second part provides a complete redesign in ARM DMA-mapping\n subsystem. The core implementation has been changed to use common\n struct dma_map_ops based infrastructure with the recent updates for\n new dma attributes merged in v3.4-rc2. This allows to use more than\n one implementation of dma-mapping calls and change/select them on the\n struct device basis. The first client of this new infractructure is\n dmabounce implementation which has been completely cut out of the\n core, common code.\n\n The last patch of this redesign update introduces a new, experimental\n implementation of dma-mapping calls on top of generic IOMMU framework.\n This lets ARM sub-platform to transparently use IOMMU for DMA-mapping\n calls if one provides required IOMMU hardware.\n\n For more information please refer to the following thread:\n\t\thttp://www.spinics.net/lists/arm-kernel/msg175729.html\n\n The last patch merges changes from both updates and provides a\n resolution for the conflicts which cannot be avoided when patches have\n been applied on the same files (mainly arch/arm/mm/dma-mapping.c).\"\n\nAcked by Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n \"Yup, this one please. It\u0027s had much work, plenty of review and I\n think even Russell is happy with it.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: (28 commits)\n ARM: dma-mapping: use PMD size for section unmap\n cma: fix migration mode\n ARM: integrate CMA with DMA-mapping subsystem\n X86: integrate CMA with DMA-mapping subsystem\n drivers: add Contiguous Memory Allocator\n mm: trigger page reclaim in alloc_contig_range() to stabilise watermarks\n mm: extract reclaim code from __alloc_pages_direct_reclaim()\n mm: Serialize access to min_free_kbytes\n mm: page_isolation: MIGRATE_CMA isolation functions added\n mm: mmzone: MIGRATE_CMA migration type added\n mm: page_alloc: change fallbacks array handling\n mm: page_alloc: introduce alloc_contig_range()\n mm: compaction: export some of the functions\n mm: compaction: introduce isolate_freepages_range()\n mm: compaction: introduce map_pages()\n mm: compaction: introduce isolate_migratepages_range()\n mm: page_alloc: remove trailing whitespace\n ARM: dma-mapping: add support for IOMMU mapper\n ARM: dma-mapping: use alloc, mmap, free from dma_ops\n ARM: dma-mapping: remove redundant code and do the cleanup\n ...\n\nConflicts:\n\tarch/x86/include/asm/dma-mapping.h\n" }, { "commit": "4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85", "tree": "99cc41c06ade46f9925268728417c9529ce5041e", "parents": [ "92bf3d09410531a06e06504957271e3978f937e2", "7b91747d42a1012e3781dd09fa638d113809e3fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:30:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:30:35 2012 -0700" }, "message": "Merge tag \u0027cris-for-linus\u0027 of git://jni.nu/cris\n\nPull CRIS changes from Jesper Nilsson:\n \"No major changes here, but fixes some compile errors for CRIS, some\n small style issues, some documentation and as a bonus nukes a couple\n of obsolete rtc-files and related code.\"\n\n* tag \u0027cris-for-linus\u0027 of git://jni.nu/cris:\n cris: Remove old legacy \"-traditional\" flag from arch-v10/lib/Makefile\n CRIS: Remove legacy RTC drivers\n cris/mm/fault.c: Port OOM changes to do_page_fault\n cris:fix the wrong function declear\n CRIS: Add _sdata to vmlinux.lds.S\n cris: posix_types.h, include asm-generic/posix_types.h\n CRIS: Update documentation\n cris/arch-v32: cryptocop: Use kzalloc\n net:removed the unused variable\n cris:removed the unused variable\n CRISv32: Correct name of read_mostly section.\n" }, { "commit": "92bf3d09410531a06e06504957271e3978f937e2", "tree": "e638413049deb010103bc65e2650d1315dbaa748", "parents": [ "603d6637aeb9a14cd0087d7c24c3777bfa51fcbf", "0caaa9539adcff38ce12e99f0ab25645e7eb3eea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:23:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:23:32 2012 -0700" }, "message": "Merge tag \u0027mmc-merge-for-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC changes from Chris Ball\n - at91-mci: This driver will be replaced by atmel-mci in 3.7.\n - atmel-mci: Add support for old at91-mci hardware.\n - dw_mmc: Allow multiple controllers; this previously caused\n corruption.\n - imxmmc: Remove this driver, replaced by mxcmmc.\n - mmci: Add device tree support.\n - omap: Allow multiple controllers.\n - omap_hsmmc: Auto CMD12, DDR support.\n - tegra: Support SD 3.0 spec.\n\nFix up the usual trivial conflicts in feature-removal-schedule.txt\n\n* tag \u0027mmc-merge-for-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (38 commits)\n mmc: at91-mci: this driver is now deprecated\n mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq\n mmc: block: Allow disabling 512B sector size emulation\n mmc: atmel-mci: add debug logs\n mmc: atmel-mci: add support for version lower than v2xx\n mmc: atmel-mci: change the state machine for compatibility with old IP\n mmc: atmel-mci: the r/w proof capability lack was not well managed\n mmc: dw_mmc: Fixed sdio interrupt mask bit setting bug\n mmc: omap: convert to module_platform_driver\n mmc: omap: make it behave well as a module\n mmc: omap: convert to per instance workqueue\n mmc: core: Remove dead code\n mmc: card: Avoid null pointer dereference\n mmc: core: Prevent eMMC VCC supply to be cut from late init\n mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue\n mmc: queue: remove redundant memsets\n mmc: queue: rename mmc_request function\n mmc: core: skip card initialization if power class selection fails\n mmc: core: fix the signaling 1.8V for HS200\n mmc: core: fix the decision of HS200/DDR card-type\n ...\n" }, { "commit": "12c4727e1d5370270a7df781d2ba0a76e05c1137", "tree": "2b0d4f5fbce329467e700f557d50b2cc126a4190", "parents": [ "98f86c9e4ae3205e4c85c535691a5d36426360ee" ], "author": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Wed May 23 15:27:40 2012 +0530" }, "committer": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Fri May 25 12:46:23 2012 +0530" }, "message": "dma-buf: minor documentation fixes.\n\nSome minor inline documentation fixes for gaps resulting from new patches.\n\nSigned-off-by: Sumit Semwal \u003csumit.semwal@ti.com\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\n" }, { "commit": "98f86c9e4ae3205e4c85c535691a5d36426360ee", "tree": "07a533aaf702c8b0a0f6ffb0b0ee2ae6e4fe62e3", "parents": [ "4c78513e457f72d5554a0f6e2eabfad7b98e4f19" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun May 20 12:33:56 2012 +0530" }, "committer": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Fri May 25 12:35:24 2012 +0530" }, "message": "dma-buf: add vmap interface\n\nThe main requirement I have for this interface is for scanning out\nusing the USB gpu devices. Since these devices have to read the\nframebuffer on updates and linearly compress it, using kmaps\nis a major overhead for every update.\n\nv2: fix warn issues pointed out by Sylwester Nawrocki.\n\nv3: fix compile !CONFIG_DMA_SHARED_BUFFER and add _GPL for now\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nReviewed-by: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\n" }, { "commit": "4c78513e457f72d5554a0f6e2eabfad7b98e4f19", "tree": "2cdb5c552580f159ff66632aef781e8739c85c42", "parents": [ "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 24 14:38:52 2012 +0530" }, "committer": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Fri May 25 12:35:24 2012 +0530" }, "message": "dma-buf: mmap support\n\nCompared to Rob Clark\u0027s RFC I\u0027ve ditched the prepare/finish hooks\nand corresponding ioctls on the dma_buf file. The major reason for\nthat is that many people seem to be under the impression that this is\nalso for synchronization with outstanding asynchronous processsing.\nI\u0027m pretty massively opposed to this because:\n\n- It boils down reinventing a new rather general-purpose userspace\n synchronization interface. If we look at things like futexes, this\n is hard to get right.\n- Furthermore a lot of kernel code has to interact with this\n synchronization primitive. This smells a look like the dri1 hw_lock,\n a horror show I prefer not to reinvent.\n- Even more fun is that multiple different subsystems would interact\n here, so we have plenty of opportunities to create funny deadlock\n scenarios.\n\nI think synchronization is a wholesale different problem from data\nsharing and should be tackled as an orthogonal problem.\n\nNow we could demand that prepare/finish may only ensure cache\ncoherency (as Rob intended), but that runs up into the next problem:\nWe not only need mmap support to facilitate sw-only processing nodes\nin a pipeline (without jumping through hoops by importing the dma_buf\ninto some sw-access only importer), which allows for a nicer\nION-\u003edma-buf upgrade path for existing Android userspace. We also need\nmmap support for existing importing subsystems to support existing\nuserspace libraries. And a loot of these subsystems are expected to\nexport coherent userspace mappings.\n\nSo prepare/finish can only ever be optional and the exporter /needs/\nto support coherent mappings. Given that mmap access is always\nsomewhat fallback-y in nature I\u0027ve decided to drop this optimization,\ninstead of just making it optional. If we demonstrate a clear need for\nthis, supported by benchmark results, we can always add it in again\nlater as an optional extension.\n\nOther differences compared to Rob\u0027s RFC is the above mentioned support\nfor mapping a dma-buf through facilities provided by the importer.\nWhich results in mmap support no longer being optional.\n\nNote that this dma-buf mmap patch does _not_ support every possible\ninsanity an existing subsystem could pull of with mmap: Because it\ndoes not allow to intercept pagefaults and shoot down ptes importing\nsubsystems can\u0027t add some magic of their own at these points (e.g. to\nautomatically synchronize with outstanding rendering or set up some\nspecial resources). I\u0027ve done a cursory read through a few mmap\nimplementions of various subsytems and I\u0027m hopeful that we can avoid\nthis (and the complexity it\u0027d bring with it).\n\nAdditonally I\u0027ve extended the documentation a bit to explain the hows\nand whys of this mmap extension.\n\nIn case we ever want to add support for explicitly cache maneged\nuserspace mmap with a prepare/finish ioctl pair, we could specify that\nuserspace needs to mmap a different part of the dma_buf, e.g. the\nrange starting at dma_buf-\u003esize up to dma_buf-\u003esize*2. This works\nbecause the size of a dma_buf is invariant over it\u0027s lifetime. The\nexporter would obviously need to fall back to coherent mappings for\nboth ranges if a legacy clients maps the coherent range and the\narchitecture cannot suppor conflicting caching policies. Also, this\nwould obviously be optional and userspace needs to be able to fall\nback to coherent mappings.\n\nv2:\n- Spelling fixes from Rob Clark.\n- Compile fix for !DMA_BUF from Rob Clark.\n- Extend commit message to explain how explicitly cache managed mmap\n support could be added later.\n- Extend the documentation with implementations notes for exporters\n that need to manually fake coherency.\n\nv3:\n- dma_buf pointer initialization goof-up noticed by Rebecca Schultz\n Zavin.\n\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nCc: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\nAcked-by: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\n" }, { "commit": "07acfc2a9349a8ce45b236c2624dad452001966b", "tree": "c40f3eaac18a8320e65af220979223b5cd632b1b", "parents": [ "b5f4035adfffbcc6b478de5b8c44b618b3124aff", "322728e55aa7834e2fab2786b76df183c4843a12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM changes from Avi Kivity:\n \"Changes include additional instruction emulation, page-crossing MMIO,\n faster dirty logging, preventing the watchdog from killing a stopped\n guest, module autoload, a new MSI ABI, and some minor optimizations\n and fixes. Outside x86 we have a small s390 and a very large ppc\n update.\n\n Regarding the new (for kvm) rebaseless workflow, some of the patches\n that were merged before we switch trees had to be rebased, while\n others are true pulls. In either case the signoffs should be correct\n now.\"\n\nFix up trivial conflicts in Documentation/feature-removal-schedule.txt\narch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.\n\nI suspect the kvm_para.h resolution ends up doing the \"do I have cpuid\"\ncheck effectively twice (it was done differently in two different\ncommits), but better safe than sorry ;)\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)\n KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block\n KVM: s390: onereg for timer related registers\n KVM: s390: epoch difference and TOD programmable field\n KVM: s390: KVM_GET/SET_ONEREG for s390\n KVM: s390: add capability indicating COW support\n KVM: Fix mmu_reload() clash with nested vmx event injection\n KVM: MMU: Don\u0027t use RCU for lockless shadow walking\n KVM: VMX: Optimize %ds, %es reload\n KVM: VMX: Fix %ds/%es clobber\n KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()\n KVM: VMX: unlike vmcs on fail path\n KVM: PPC: Emulator: clean up SPR reads and writes\n KVM: PPC: Emulator: clean up instruction parsing\n kvm/powerpc: Add new ioctl to retreive server MMU infos\n kvm/book3s: Make kernel emulated H_PUT_TCE available for \"PR\" KVM\n KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler\n KVM: PPC: Book3S: Enable IRQs during exit handling\n KVM: PPC: Fix PR KVM on POWER7 bare metal\n KVM: PPC: Fix stbux emulation\n KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields\n ...\n" }, { "commit": "b5f4035adfffbcc6b478de5b8c44b618b3124aff", "tree": "e7a5f011d8aaf5c95edf933f98f25dfc8fa46837", "parents": [ "ce004178be1bbaa292e9e6497939e2970300095a", "68c2c39a76b094e9b2773e5846424ea674bf2c46" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:02:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:02:08 2012 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.5-rc0-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\nPull Xen updates from Konrad Rzeszutek Wilk:\n \"Features:\n * Extend the APIC ops implementation and add IRQ_WORKER vector\n support so that \u0027perf\u0027 can work properly.\n * Fix self-ballooning code, and balloon logic when booting as initial\n domain.\n * Move array printing code to generic debugfs\n * Support XenBus domains.\n * Lazily free grants when a domain is dead/non-existent.\n * In M2P code use batching calls\n Bug-fixes:\n * Fix NULL dereference in allocation failure path (hvc_xen)\n * Fix unbinding of IRQ_WORKER vector during vCPU hot-unplug\n * Fix HVM guest resume - we would leak an PIRQ value instead of\n reusing the existing one.\"\n\nFix up add-add onflicts in arch/x86/xen/enlighten.c due to addition of\napic ipi interface next to the new apic_id functions.\n\n* tag \u0027stable/for-linus-3.5-rc0-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: do not map the same GSI twice in PVHVM guests.\n hvc_xen: NULL dereference on allocation failure\n xen: Add selfballoning memory reservation tunable.\n xenbus: Add support for xenbus backend in stub domain\n xen/smp: unbind irqworkX when unplugging vCPUs.\n xen: enter/exit lazy_mmu_mode around m2p_override calls\n xen/acpi/sleep: Enable ACPI sleep via the __acpi_os_prepare_sleep\n xen: implement IRQ_WORK_VECTOR handler\n xen: implement apic ipi interface\n xen/setup: update VA mapping when releasing memory during setup\n xen/setup: Combine the two hypercall functions - since they are quite similar.\n xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM\n xen/setup: Only print \"Freeing XXX-YYY pfn range: Z pages freed\" if Z \u003e 0\n xen/gnttab: add deferred freeing logic\n debugfs: Add support to print u32 array in debugfs\n xen/p2m: An early bootup variant of set_phys_to_machine\n xen/p2m: Collapse early_alloc_p2m_middle redundant checks.\n xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument\n xen/p2m: Move code around to allow for better re-usage.\n" }, { "commit": "b1bf7d4d1b3911352cf1ec63c1de06214288ccd0", "tree": "0fd27c638977cb5c7e6e3f95085ce842b57a4ae3", "parents": [ "0708500d49e8439d9fe5529795bdc1485f0f46c3", "3e11f7b840b4671213c66817294ad7dd0b572756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO driver changes from Grant Likely:\n \"Lots of gpio changes, both to core code and drivers.\n\n Changes do touch architecture code to remove the need for separate\n arm/gpio.h includes in most architectures.\n\n Some new drivers are added, and a number of gpio drivers are converted\n to use irq_domains for gpio inputs used as interrupts. Device tree\n support has been amended to allow multiple gpio_chips to use the same\n device tree node.\n\n Remaining changes are primarily bug fixes.\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (33 commits)\n gpio/generic: initialize basic_mmio_gpio shadow variables properly\n gpiolib: Remove \u0027const\u0027 from data argument of gpiochip_find()\n gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583\n gpiolib: quiet gpiochip_add boot message noise\n gpio: mpc8xxx: Prevent NULL pointer deref in demux handler\n gpio/lpc32xx: Add device tree support\n gpio: Adjust of_xlate API to support multiple GPIO chips\n gpiolib: Implement devm_gpio_request_one()\n gpio-mcp23s08: dbg_show: fix pullup configuration display\n Add support for TCA6424A\n gpio/omap: (re)fix wakeups on level-triggered GPIOs\n gpio/omap: fix broken context restore for non-OFF mode transitions\n gpio/omap: fix missing check in *_runtime_suspend()\n gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()\n gpio/omap: remove suspend/resume callbacks\n gpio/omap: remove retrigger variable in gpio_irq_handler\n gpio/omap: remove saved_wakeup field from struct gpio_bank\n gpio/omap: remove suspend_wakeup field from struct gpio_bank\n gpio/omap: remove saved_fallingdetect, saved_risingdetect\n gpio/omap: remove virtual_irq_start variable\n ...\n\nConflicts:\n\tdrivers/gpio/gpio-samsung.c\n" }, { "commit": "be122abe4bcd6d39b37892daae28c8bf5e4030fc", "tree": "e8ad84c41c2acde27c77fa212b8865cd3acfe6fb", "parents": [ "b343c8beec664ef6f0e9964d3001c7c7966331ae", "1e8a52e18cfb381bc9cc1f0b720540364d2a6edd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:56:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:56:24 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI changes from Grant Likely:\n \"Bug fixes and new features for SPI device drivers. Also move device\n tree support code out of drivers/of and into drivers/spi/spi.c where\n it makes more sense.\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi: By default setup spi_masters with 1 chipselect and dynamics bus number\n SPI: PRIMA2: use the newest APIs of PINCTRL to fix compiling errors\n spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control\n spi: refactor spi-coldfire-qspi to use SPI queue framework.\n spi/omap2-mcspi: convert to the pump message infrastructure\n spi/rspi: add dmaengine support\n spi/topcliff: use correct __devexit_p annotation\n spi: Dont call prepare/unprepare transfer if not populated\n spi/ep93xx: clean probe/remove routines\n spi/devicetree: Move devicetree support code into spi directory\n spi: use module_pci_driver\n spi/omap2-mcspi: Trivial optimisation\n spi: omap2-mcspi: add support for pm_runtime autosuspend\n spi/omap: Remove bus_num usage for instance index\n OMAP : SPI : use devm_* functions\n spi: omap2-mcspi: convert to module_platform_driver\n spi: omap2-mcspi: make it behave as a module\n" }, { "commit": "2f78d8e249973f1eeb88315e6444e616c60177ae", "tree": "2f6fae6c781622301c40378ea404096d8f231a33", "parents": [ "f2fde3a65e88330017b816faf2ef75f141d21375", "26c72e22c94fbc28604c94e3a96fdae9c6fd0a42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:57:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:57:47 2012 -0700" }, "message": "Merge tag \u0027firewire-updates\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394\n\nPull IEEE 1394 (FireWire) subsystem updates from Stefan Richter:\n\n - Fix mismatch between DMA mapping direction (was wrong) and DMA\n synchronization direction (was correct) of isochronous reception\n buffers of userspace drivers if vma-mapped for R/W access. For\n example, libdc1394 was affected.\n\n - more consistent retry stategy in device discovery/ rediscovery, and\n improved failure diagnostics\n\n - various small cleanups, e.g. use SCSI layer\u0027s DMA mapping API in\n firewire-sbp2\n\n* tag \u0027firewire-updates\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:\n firewire: sbp2: document the absence of alignment requirements\n firewire: sbp2: remove superfluous blk_queue_max_segment_size() call\n firewire: sbp2: use scsi_dma_(un)map\n firewire: sbp2: give correct DMA device to scsi framework\n firewire: core: fw_device_refresh(): clean up error handling\n firewire: core: log config rom reading errors\n firewire: core: log error in case of failed bus manager lock\n firewire: move rcode_string() to core\n firewire: core: improve reread_config_rom() interface\n firewire: core: wait for inaccessible devices after bus reset\n firewire: ohci: omit spinlock IRQ flags where possible\n firewire: ohci: correct signedness of a local variable\n firewire: core: fix DMA mapping direction\n firewire: use module_pci_driver\n" }, { "commit": "f2fde3a65e88330017b816faf2ef75f141d21375", "tree": "57152ab5756e7ed1c58742e7e16f13a45ff11f21", "parents": [ "28f3d717618156c0dcd2f497d791b578a7931d87", "8c914028f5ddaa417b7d0f4b7fdc24caceaa8043" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:42:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:42:54 2012 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull main drm updates from Dave Airlie:\n \"This is the main merge window request for the drm.\n\n It\u0027s big, but jam packed will lots of features and of course 0\n regressions. (okay maybe there\u0027ll be one).\n\n Highlights:\n\n - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus\n (qemu only). These drivers use the generic modesetting drivers.\n\n - initial prime/dma-buf support for i915, nouveau, radeon, udl and\n exynos\n\n - switcheroo audio support: so GPUs with HDMI can turn off the sound\n driver without crashing stuff.\n\n - There are some patches drifting outside drivers/gpu into x86 and\n EFI for better handling of multiple video adapters in Apple Macs,\n they\u0027ve got correct acks except one trivial fixup.\n\n - Core:\n\tedid parser has better DMT and reduced blanking support,\n\tcrtc properties,\n\tplane properties,\n\n - Drivers:\n\texynos: add 2D core accel support, prime support, hdmi features\n\tintel: more Haswell support, initial Valleyview support, more\n\t hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of\n\t cleanups and fixes\n\tradeon: more HDMI audio support, improved GPU lockup recovery\n\t support, remove nested mutexes, less memory copying on PCIE, fix\n\t bus master enable race (kexec), improved fence handling\n\tgma500: cleanups, 1080p support, acpi fixes\n\tnouveau: better nva3 memory reclocking, kepler accel (needs\n\t external firmware rip), async buffer moves on nv84+ hw.\n\n I\u0027ve some more dma-buf patches that rely on the dma-buf merge for vmap\n stuff, and I\u0027ve a few fixes building up, but I\u0027d decided I\u0027d better\n get rid of the main pull sooner rather than later, so the audio guys\n are also unblocked.\"\n\nFix up trivial conflict due to some duplicated changes in\ndrivers/gpu/drm/i915/intel_ringbuffer.c\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (605 commits)\n drm/nouveau/nvd9: Fix GPIO initialisation sequence.\n drm/nouveau: Unregister switcheroo client on exit\n drm/nouveau: Check dsm on switcheroo unregister\n drm/nouveau: fix a minor annoyance in an output string\n drm/nouveau: turn a BUG into a WARN\n drm/nv50: decode PGRAPH DATA_ERROR \u003d 0x24\n drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks\n drm/nvd9/copy: initialise copy engine, seems to work like nvc0\n drm/nvc0/ttm: use copy engines for async buffer moves\n drm/nva3/ttm: use copy engine for async buffer moves\n drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method\n drm/nv84/ttm: use crypto engine for async buffer copies\n drm/nouveau/ttm: untangle code to support accelerated buffer moves\n drm/nouveau/fbcon: use fence for sync, rather than notifier\n drm/nv98/crypt: non-stub implementation of the engine hooks\n drm/nouveau/fifo: turn all fifo modules into engine modules\n drm/nv50/graph: remove ability to do interrupt-driven context switching\n drm/nv50: remove manual context unload on context destruction\n drm/nv50: remove execution engine context saves on suspend\n drm/nv50/fifo: use hardware channel kickoff functionality\n ...\n" }, { "commit": "28f3d717618156c0dcd2f497d791b578a7931d87", "tree": "37b11581b51929b5473541e53bd242b3e1a9f666", "parents": [ "654443e20dfc0617231f28a07c96a979ee1a0239", "1ca7ee30630e1022dbcf1b51be20580815ffab73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:54:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:54:29 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull more networking updates from David Miller:\n \"Ok, everything from here on out will be bug fixes.\"\n\n1) One final sync of wireless and bluetooth stuff from John Linville.\n These changes have all been in his tree for more than a week, and\n therefore have had the necessary -next exposure. John was just away\n on a trip and didn\u0027t have a change to send the pull request until a\n day or two ago.\n\n2) Put back some defines in user exposed header file areas that were\n removed during the tokenring purge. From Stephen Hemminger and Paul\n Gortmaker.\n\n3) A bug fix for UDP hash table allocation got lost in the pile due to\n one of those \"you got it.. no I\u0027ve got it..\" situations. :-)\n\n From Tim Bird.\n\n4) SKB coalescing in TCP needs to have stricter checks, otherwise we\u0027ll\n try to coalesce overlapping frags and crash. Fix from Eric Dumazet.\n\n5) RCU routing table lookups can race with free_fib_info(), causing\n crashes when we deref the device pointers in the route. Fix by\n releasing the net device in the RCU callback. From Yanmin Zhang.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits)\n tcp: take care of overlaps in tcp_try_coalesce()\n ipv4: fix the rcu race between free_fib_info and ip_route_output_slow\n mm: add a low limit to alloc_large_system_hash\n ipx: restore token ring define to include/linux/ipx.h\n if: restore token ring ARP type to header\n xen: do not disable netfront in dom0\n phy/micrel: Fix ID of KSZ9021\n mISDN: Add X-Tensions USB ISDN TA XC-525\n gianfar:don\u0027t add FCB length to hard_header_len\n Bluetooth: Report proper error number in disconnection\n Bluetooth: Create flags for bt_sk()\n Bluetooth: report the right security level in getsockopt\n Bluetooth: Lock the L2CAP channel when sending\n Bluetooth: Restore locking semantics when looking up L2CAP channels\n Bluetooth: Fix a redundant and problematic incoming MTU check\n Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C\n Bluetooth: Fix EIR data generation for mgmt_device_found\n Bluetooth: Fix Inquiry with RSSI event mask\n Bluetooth: improve readability of l2cap_seq_list code\n Bluetooth: Fix skb length calculation\n ...\n" }, { "commit": "2c01e7bc46f10e9190818437e564f7e0db875ae9", "tree": "8b06c85d69754f7df27f7fb42520f6e2ceaea907", "parents": [ "ab11ca34eea8fda7a1a9302d86f6ef6108ffd68f", "e644dae645e167d154c0526358940986682a72b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:34:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:34:29 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input layer updates from Dmitry Torokhov:\n - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics\n Navpoint, LM8333 keypads, Wacom I2C touhscreen);\n - updates to existing touchpad drivers (ALPS, Sntelic);\n - Wacom driver now supports Intuos5;\n - device-tree bindings in numerous drivers;\n - other cleanups and fixes.\n\nFix annoying conflict in drivers/input/tablet/wacom_wac.c that I think\nimplies that the input layer device naming is broken, but let\u0027s see. I\nbrough it up with Dmitry.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)\n Input: matrix-keymap - fix building keymaps\n Input: spear-keyboard - document DT bindings\n Input: spear-keyboard - add device tree bindings\n Input: matrix-keymap - wire up device tree support\n Input: matrix-keymap - uninline and prepare for device tree support\n Input: adp5588 - add support for gpio names\n Input: omap-keypad - dynamically handle register offsets\n Input: synaptics - fix compile warning\n MAINTAINERS: adjust input-related patterns\n Input: ALPS - switch to using input_mt_report_finger_count\n Input: ALPS - add semi-MT support for v4 protocol\n Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver\n Input: atmel_mxt_ts - dump each message on just 1 line\n Input: atmel_mxt_ts - do not read extra (checksum) byte\n Input: atmel_mxt_ts - verify object size in mxt_write_object\n Input: atmel_mxt_ts - only allow root to update firmware\n Input: atmel_mxt_ts - use CONFIG_PM_SLEEP\n Input: sentelic - report device\u0027s production serial number\n Input: tl6040-vibra - Device Tree support\n Input: evdev - properly handle read/write with count 0\n ...\n" }, { "commit": "ab11ca34eea8fda7a1a9302d86f6ef6108ffd68f", "tree": "987ec6c263f3dfa4a7a6f9ce4d5ece47cbc12e29", "parents": [ "f9369910a6225b8d4892c3f20ae740a711cd5ace", "71006fb22b0f5a2045605b3887ee99a0e9adafe4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:21:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:21:51 2012 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media updates from Mauro Carvalho Chehab:\n - some V4L2 API updates needed by embedded devices\n - DVB API extensions for ATSC-MH delivery system, used in US for mobile\n TV\n - new tuners for fc0011/0012/0013 and tua9001\n - a new dvb driver for af9033/9035\n - a new ATSC-MH frontend (lg2160)\n - new remote controller keymaps\n - Removal of a few legacy webcam driver that got replaced by gspca on\n several kernel versions ago\n - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)\n - a new webcam sensor driver (smiapp)\n - a new video input driver for embedded (sta2x1xx)\n - several improvements, fixes, cleanups, etc inside the drivers.\n\nManually fix up conflicts due to err() -\u003e dev_err() conversion in\ndrivers/staging/media/easycap/easycap_main.c\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)\n [media] saa7134-cards: Remove a PCI entry added by mistake\n [media] radio-sf16fmi: add support for SF16-FMD\n [media] rc-loopback: remove duplicate line\n [media] patch for Asus My Cinema PS3-100 (1043:48cd)\n [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS\n [media] em28xx: simple comment fix\n [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2\n [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()\n [media] smiapp: Add support for 8-bit uncompressed formats\n [media] smiapp: Allow generic quirk registers\n [media] smiapp: Use non-binning limits if the binning limit is zero\n [media] smiapp: Initialise rval in smiapp_read_nvm()\n [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check\n [media] smiapp: Use 8-bit reads only before identifying the sensor\n [media] smiapp: Quirk for sensors that only do 8-bit reads\n [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client\n [media] smiapp: Allow using external clock from the clock framework\n [media] zl10353: change .read_snr() to report SNR as a 0.1 dB\n [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)\n [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try\n ...\n" }, { "commit": "e644dae645e167d154c0526358940986682a72b0", "tree": "972993c6568085b8d407fc7e13de10f4b93c651d", "parents": [ "899c612d74d4a242158a4db20367388d6299c028", "86809173ce32ef03bd4d0389dfc72df0c805e9c4" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 24 01:13:01 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 24 01:13:01 2012 -0700" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "86809173ce32ef03bd4d0389dfc72df0c805e9c4", "tree": "ff003530a58eff45d770827dfae71e6d6c730473", "parents": [ "6123f1192b610c3d8520eb7bb49f68ff7ca94b80" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 24 01:10:20 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 24 01:12:20 2012 -0700" }, "message": "Input: matrix-keymap - fix building keymaps\n\nKeymaps used by drivers based on matrix-keymap facilities are arrays of\nunsigned shorts, not chars. Treating them otherwise produces corrupted\nkeymaps.\n\nReported-by: Sourav Poddar \u003csourav.poddar@ti.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "af3289e96383a60f5d3096afeb5579b837aad5e0", "tree": "da4be094751a91df13833a50a724eb7774f099ff", "parents": [ "5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Mon May 21 14:51:50 2012 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:37 2012 +1000" }, "message": "drm/nouveau/nvd9: Fix GPIO initialisation sequence.\n\nSigned-off-by: Marcin Kościelnicki \u003ckoriakin@0x04.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f", "tree": "9b89f405badd9d4fb26fbdb5e819b39eceed99ae", "parents": [ "2f3787aa439ae0d34e4658400c1139a7541bec1d" ], "author": { "name": "Andreas Heider", "email": "andreas@meetr.de", "time": "Mon May 21 00:14:51 2012 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:36 2012 +1000" }, "message": "drm/nouveau: Unregister switcheroo client on exit\n\nCurrently nouveau only registers as a vga_switcheroo client, but never\nunregisters. This patch adds the necessary unregister calls.\n\nSigned-off-by: Andreas Heider \u003candreas@meetr.de\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "2f3787aa439ae0d34e4658400c1139a7541bec1d", "tree": "b0465658f2a4593eea40af2d1865917490b5d432", "parents": [ "42eddbd7b2b5cc9bbb4c918a3294b6ee9dd53c59" ], "author": { "name": "Andreas Heider", "email": "andreas@meetr.de", "time": "Mon May 21 00:14:50 2012 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:34 2012 +1000" }, "message": "drm/nouveau: Check dsm on switcheroo unregister\n\nCurrently vga_switcheroo_unregister_handler is called unconditionally when\nnouveau is unloaded, even when nouveau never registered a handler. This\ninterferes with other switcheroo handlers, as vga_switcheroo doesn\u0027t check who\ncalled unregister_handler, but simply unregisters the current handler. This\npatch adds a check so unregister is only called if a handler was registered by\nnouveau before.\n\nSigned-off-by: Andreas Heider \u003candreas@meetr.de\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "42eddbd7b2b5cc9bbb4c918a3294b6ee9dd53c59", "tree": "030b7f40713d8cdffc3b82f8e99ac87d51b9335c", "parents": [ "6e5a429bcb132a68f17418ae82ba90ec4412084e" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed May 09 20:17:07 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:32 2012 +1000" }, "message": "drm/nouveau: fix a minor annoyance in an output string\n\nBugs me every time I put in the TNT2..\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "6e5a429bcb132a68f17418ae82ba90ec4412084e", "tree": "5a2ea9fe0b5ff4ad3f9712f003d8d1dc2e914b7d", "parents": [ "547e6c7fc81a34fd61669387f1d582af39cc5570" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed May 09 12:47:03 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:29 2012 +1000" }, "message": "drm/nouveau: turn a BUG into a WARN\n\nThis is very annoying sometimes..\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "547e6c7fc81a34fd61669387f1d582af39cc5570", "tree": "34dfc94c5c3984f91813c2eb7e4fb80c604b338f", "parents": [ "a6a17859f1bdf607650ee055101f54c5f207762b" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Sun May 06 23:08:55 2012 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:27 2012 +1000" }, "message": "drm/nv50: decode PGRAPH DATA_ERROR \u003d 0x24\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a6a17859f1bdf607650ee055101f54c5f207762b", "tree": "fcee3566bfb597111a957406e84171fd79c0e8e2", "parents": [ "0c75f332e50949b62add5d5fc3f7ee4829c8972a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sat May 05 00:39:21 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:26 2012 +1000" }, "message": "drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "0c75f332e50949b62add5d5fc3f7ee4829c8972a", "tree": "116f12edcda4b28a2c78d7d984fc62fb511caaf2", "parents": [ "1a46098e910b96337f0fe3838223db43b923bad4" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 17:16:46 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:24 2012 +1000" }, "message": "drm/nvd9/copy: initialise copy engine, seems to work like nvc0\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1a46098e910b96337f0fe3838223db43b923bad4", "tree": "1d0d09e6a48a2f11d9dc0e2f2f409fb8149c9a3f", "parents": [ "fdf53241c1845a4a1d8bd2df65f574b281649957" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 15:17:28 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:23 2012 +1000" }, "message": "drm/nvc0/ttm: use copy engines for async buffer moves\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "fdf53241c1845a4a1d8bd2df65f574b281649957", "tree": "d9cf8102465af24257edb99bc778b3142cd5bb83", "parents": [ "5490e5dfb9e9d654b0ed06c2989a73402496adf6" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 15:15:12 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:21 2012 +1000" }, "message": "drm/nva3/ttm: use copy engine for async buffer moves\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5490e5dfb9e9d654b0ed06c2989a73402496adf6", "tree": "7d6a2080d05cbf6a79e7e0c1bd03d4c9e7629160", "parents": [ "4c193d254ee94da02857b9670e815b1765a9579b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 14:34:16 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:19 2012 +1000" }, "message": "drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method\n\nDisabled for the moment until some performance issues are sorted out, code\ncommitted as a reference point.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "4c193d254ee94da02857b9670e815b1765a9579b", "tree": "954c01429fce95bea8c418c7d68e6188eb61d6b3", "parents": [ "d1b167e168bdac0b6af11e7a8c601773639fc419" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 14:21:15 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:18 2012 +1000" }, "message": "drm/nv84/ttm: use crypto engine for async buffer copies\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d1b167e168bdac0b6af11e7a8c601773639fc419", "tree": "84af7888dc726609901bbf00ec179a77dfef6c26", "parents": [ "78df3a1c585c8c95fd9a472125f0cd406e8617ce" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 14:01:52 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:16 2012 +1000" }, "message": "drm/nouveau/ttm: untangle code to support accelerated buffer moves\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "78df3a1c585c8c95fd9a472125f0cd406e8617ce", "tree": "c512603e4442acbdb65896168da41140ca2cb479", "parents": [ "b355096992e2b4d30bb77173927f45e7f2c12570" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 14:01:28 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:15 2012 +1000" }, "message": "drm/nouveau/fbcon: use fence for sync, rather than notifier\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "b355096992e2b4d30bb77173927f45e7f2c12570", "tree": "69a580dcf707cf19b8e44dc78c8e74da3de40129", "parents": [ "c420b2dc8dc3cdd507214f4df5c5f96f08812cbe" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed May 02 21:00:20 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:13 2012 +1000" }, "message": "drm/nv98/crypt: non-stub implementation of the engine hooks\n\nfuc is from pscnv driver.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "c420b2dc8dc3cdd507214f4df5c5f96f08812cbe", "tree": "6dca9f0aba3de22a2bda5fe647d6945d4f4e986e", "parents": [ "a226c32a386bca0426e500954b79e3fd46afc0d9" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 20:48:08 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:11 2012 +1000" }, "message": "drm/nouveau/fifo: turn all fifo modules into engine modules\n\nBeen tested on each major revision that\u0027s relevant here, but I\u0027m sure there\nare still bugs waiting to be ironed out.\n\nThis is a *very* invasive change.\n\nThere\u0027s a couple of pieces left that I don\u0027t like much (eg. other engines\nusing fifo_priv for the channel count), but that\u0027s an artefact of there\nbeing a master channel list still. This is changing, slowly.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a226c32a386bca0426e500954b79e3fd46afc0d9", "tree": "c7b72f1f93a955f637a78bbf19caac01b6552cbf", "parents": [ "5511d490da02b73c4c2144c7a2d368634caca67f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 16:48:50 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:10 2012 +1000" }, "message": "drm/nv50/graph: remove ability to do interrupt-driven context switching\n\nWe never turn this on, no point maintaining the code for it..\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5511d490da02b73c4c2144c7a2d368634caca67f", "tree": "2883fdaf570e8741510a8d4214cbe0e5f2d264ef", "parents": [ "7f2062e9de357e4158645b72b472ccba229cb3aa" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 16:46:28 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:08 2012 +1000" }, "message": "drm/nv50: remove manual context unload on context destruction\n\nPFIFO context destruction triggers this automagically now.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "7f2062e9de357e4158645b72b472ccba229cb3aa", "tree": "ba756779daa12146fd5016965da0b24eaf497213", "parents": [ "03bd6efa1468830d1dc9380654229d427aa487d7" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 16:39:08 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:07 2012 +1000" }, "message": "drm/nv50: remove execution engine context saves on suspend\n\nNow triggered automagically by the GPU on PFIFO takedown.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "03bd6efa1468830d1dc9380654229d427aa487d7", "tree": "3a264d0a0e7503d4a50a1d388396c0e726e244bd", "parents": [ "71af5e62db5d7d6348e838d0f79533653e2f8cfe" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 16:33:37 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:05 2012 +1000" }, "message": "drm/nv50/fifo: use hardware channel kickoff functionality\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "71af5e62db5d7d6348e838d0f79533653e2f8cfe", "tree": "c40087d04f7bb58acdb149322000f02065fb3d57", "parents": [ "694931d20f41f9bf23f96ccae1b3a12a13ed54d9" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 16:12:32 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:03 2012 +1000" }, "message": "drm/nv50/gr: make sure NEXT_TO_CURRENT is executed even if nothing done\n\nPFIFO channel kickoff will hang sometimes otherwise.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "694931d20f41f9bf23f96ccae1b3a12a13ed54d9", "tree": "fbe68080b118e6ab8033c4239de1ff160aac0dfd", "parents": [ "67b342efc761046a22b73c327837479b58613a41" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 13:59:31 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:02 2012 +1000" }, "message": "drm/nv50/fifo: construct playlist from hw context table state\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "67b342efc761046a22b73c327837479b58613a41", "tree": "86a7d34699e48b855a8a99d8aaab3465cd2f8cd3", "parents": [ "906c033e276877c1374c9159976b05746af3c86d" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 01 10:14:07 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:56:00 2012 +1000" }, "message": "drm/nouveau/fifo: remove all the \"special\" engine hooks\n\nAll the places this stuff is actually needed tends to be chipset-specific\nanyway, so we\u0027re able to just inline the register bashing instead.\n\nThe parts of the common code that still directly touch PFIFO temporarily\nhave conditionals, these will be removed in subsequent commits that will\nrefactor the fifo modules into engine modules like graph/mpeg etc.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "906c033e276877c1374c9159976b05746af3c86d", "tree": "f7e03b7148cf9f5caad6ac72b33e0354e94aad41", "parents": [ "299bee10fb228fce4a3fc5dd89f32787a6e58fe5" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 16:25:47 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:58 2012 +1000" }, "message": "drm/nouveau/fence: fix a race where fence-\u003echannel can disappear\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "299bee10fb228fce4a3fc5dd89f32787a6e58fe5", "tree": "9655bcefb432220f72393d74bb10db83528f7710", "parents": [ "f51ee65c75d42633e693dd1704772ad241d9748a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 04 16:25:13 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:56 2012 +1000" }, "message": "drm/nouveau/bios: fix some shadowing issues, particularly acpi\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "f51ee65c75d42633e693dd1704772ad241d9748a", "tree": "2191b5399341d06795c2c00d7aaa5dc47448e841", "parents": [ "5e120f6e4b3f35b741c5445dfc755f50128c3c44" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 03 16:54:15 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:55 2012 +1000" }, "message": "drm/nouveau: fix engine context destructor ordering\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5e120f6e4b3f35b741c5445dfc755f50128c3c44", "tree": "210b2bb8f5dccfcb4a6c134341fa31a633ba5243", "parents": [ "d375e7d56dffa564a6c337d2ed3217fb94826100" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Apr 30 13:55:29 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:53 2012 +1000" }, "message": "drm/nouveau/fence: convert to exec engine, and improve channel sync\n\nNow have a somewhat simpler semaphore sync implementation for nv17:nv84,\nand a switched to using semaphores as fences on nv84+ and making use of\nthe hardware\u0027s \u003e\u003d acquire operation.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d375e7d56dffa564a6c337d2ed3217fb94826100", "tree": "ddce2af34f6c0eee35cb3b5c99cd1707d6b63ae4", "parents": [ "875ac34aad49bb875833aed2b4f2deb7a28df9f0" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Apr 30 13:30:00 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:46 2012 +1000" }, "message": "drm/nouveau/fence: minor api changes for an upcoming rework\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "875ac34aad49bb875833aed2b4f2deb7a28df9f0", "tree": "254aedbbc3c838471090154a9d14d29ad86211de", "parents": [ "35bcf5d55540e47091a67e5962f12b88d51d7131" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Apr 30 12:51:48 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:44 2012 +1000" }, "message": "drm/nouveau/fence: make ttm interfaces wrap ours, not the other way around\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "35bcf5d55540e47091a67e5962f12b88d51d7131", "tree": "162d17e735b85817c8c6c881093995a2e6eef336", "parents": [ "20abd1634a6e2eedb84ca977adea56b8aa06cc3e" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Apr 30 11:34:10 2012 -0500" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:43 2012 +1000" }, "message": "drm/nouveau: move flip-related channel setup to software engine\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "20abd1634a6e2eedb84ca977adea56b8aa06cc3e", "tree": "32eca9cf843cf2aa5163b15e76f833691eb306a2", "parents": [ "2cda7f4c5e83925fe687f63625893e033358de4e" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Apr 30 11:33:43 2012 -0500" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:55:41 2012 +1000" }, "message": "drm/nouveau: create real execution engine for software object class\n\nJust a cleanup more or less, and to remove the need for special handling of\nsoftware objects.\n\nThis removes a heap of documentation on dma/graph object formats. The info\nis very out of date with our current understanding, and is far better\ndocumented in rnndb in envytools git.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "2cda7f4c5e83925fe687f63625893e033358de4e", "tree": "1cc5099ff5c3f50dec27cde64b8443319fa89ed9", "parents": [ "afada5e0bb3cac8530c2ae36aa0abca41d60e063" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Apr 30 10:56:09 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:32:03 2012 +1000" }, "message": "drm/nvd0/disp: remove unnecessary sync from flip_next\n\nThis shouldn\u0027t be necessary, I believe this is just a bit of missed debug\ncode that got left over somehow.\n\nCauses flips to be always synced to vblank, regardless of swap interval,\nwhich we don\u0027t want..\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "afada5e0bb3cac8530c2ae36aa0abca41d60e063", "tree": "32c87d14179a21c5fbec15ae1c1e30b724d1c9ac", "parents": [ "695b95b810d1c3024d7bad9e3658a35e11a60d86" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Nov 22 13:59:30 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:32:01 2012 +1000" }, "message": "drm/nv04/disp: disable vblank interrupts when disabling display\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "695b95b810d1c3024d7bad9e3658a35e11a60d86", "tree": "20a57ff7ec4ee458ff409eb26b3238fac8960182", "parents": [ "d58086deaa32dc5e630aab222851b282f77e00bb" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Wed Apr 25 23:20:33 2012 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:59 2012 +1000" }, "message": "drm/nouveau: base fence timeout on time of emission\n\nWait loop can be interrupted by signal, so if signals are raised\nperiodically (e.g. SIGALRM) this loop may never finish. Use\nemission time as a base for fence timeout.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d58086deaa32dc5e630aab222851b282f77e00bb", "tree": "2fab5eec82dcc5fa89d7d4e876cc6e561a30cc53", "parents": [ "a8f81837c506aba186b42f0c67633e85851395b1" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Apr 20 11:54:33 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:58 2012 +1000" }, "message": "drm/nv40-50/gr: restructure grctx/prog generation\n\nThe conditional definition of the generation helper functions apparently\nconfuses some IDEs....\n\nReported-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a8f81837c506aba186b42f0c67633e85851395b1", "tree": "522ff28e562b4fc9eacf7d51d9f4d7a7763afdb5", "parents": [ "5ace2c9d6f5bc4600ca43fe188a33efc4c2dba79" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Apr 20 11:01:46 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:56 2012 +1000" }, "message": "drm/nv50/disp: fixup error paths in crtc object creation\n\nReported-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5ace2c9d6f5bc4600ca43fe188a33efc4c2dba79", "tree": "59b194d4528fe1e3ade4655022dc7574d17053be", "parents": [ "d37f60c87fbf9dca6724ed42fd55b031f88dd46a" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Sun Apr 15 14:36:08 2012 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:54 2012 +1000" }, "message": "drm/nouveau: cleanup after display init failure\n\nDepending on exact point of failure, not cleaning would lead to\nBUG_ONs/oopses in various distant places.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d37f60c87fbf9dca6724ed42fd55b031f88dd46a", "tree": "2b6bb35f2a8e93f957503ec32103d72496dd3ae8", "parents": [ "d8b6624549342e4b01a5fa8273029d9139439ae4" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Sun Apr 15 14:36:07 2012 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:52 2012 +1000" }, "message": "drm/nv50: fix ramin heap size for kernel channel too\n\nPort change from \"drm/nouveau: Keep RAMIN heap within the channel\"\nto kernel channel, which has its own ramin heap initialisation.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Younes Manton \u003cyounes.m@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d8b6624549342e4b01a5fa8273029d9139439ae4", "tree": "5ee860222baa987f0ec54fdfa52758a6f84a273e", "parents": [ "6d597027755b2eed4298b85ebe3cb5c93b29d1a9" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Apr 04 11:16:44 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:50 2012 +1000" }, "message": "drm/nve0/graph: bump hub2gpc buffer size\n\nReported-by: Christoph Bumiller \u003ce0425955@student.tuwien.ac.at\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "6d597027755b2eed4298b85ebe3cb5c93b29d1a9", "tree": "827e189534f285c2bbf4c96e627685d27937b4db", "parents": [ "78339fb75c21403677f61a02e1839b626a79325b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sun Apr 01 21:09:13 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:49 2012 +1000" }, "message": "drm/nouveau: use the same packet header macros as userspace\n\nCosmetic cleanup only.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "78339fb75c21403677f61a02e1839b626a79325b", "tree": "597405086b8a29379f83ffe3713bfa6c55c493f1", "parents": [ "c6b7e89582bdb028e1b1763197ff24c77a43e1b0" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 30 13:14:45 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:47 2012 +1000" }, "message": "drm/nouveau/bios: allow loading alternate vbios image as firmware\n\nUseful for debugging different VBIOS versions.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "c6b7e89582bdb028e1b1763197ff24c77a43e1b0", "tree": "e3fcb3794462c02758f253183d80ec9fa69c4d56", "parents": [ "f1c65e7c7fb7e109290e969ad17f08c45993b41c" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Mar 20 14:36:04 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:45 2012 +1000" }, "message": "drm/nve0/ttm: implement buffer moves with weirdo pcopy-on-pgraph methods\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "f1c65e7c7fb7e109290e969ad17f08c45993b41c", "tree": "41173b42c4780fb7c9b57d1d6c3a3484c838935e", "parents": [ "ab394543ddd02b6cc6612a3c1991a18fb3056a45" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Mar 20 14:20:50 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:43 2012 +1000" }, "message": "drm/nv50-/fbcon: move 2d class to subchannel 3\n\nKepler GRAPH has (well, sorta) fixed subchannel\u003c-\u003eclass assignments, make\nthis match up to keep it happy without trapping.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "ab394543ddd02b6cc6612a3c1991a18fb3056a45", "tree": "b5f07e24e3b1e091578357694a6dc7a45cbb368e", "parents": [ "5132f37700210740117f5163b5df7aa1c8469a55" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Mar 13 13:05:13 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:41 2012 +1000" }, "message": "drm/nve0/gr: initial implementation\n\nThis may, perhaps, get re-merged with nvc0_graph.c at some point. It\u0027s\nstill unclear as to how great an idea that\u0027d be. Stay tuned...\n\nCompletely dependent on firmware blobs from NVIDIA binary driver currently.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5132f37700210740117f5163b5df7aa1c8469a55", "tree": "9fc54f2c9cb81282b5b2dac62fe335ce26c1f6f7", "parents": [ "d0f3c7e41d30859a638083654002b9b6faf7f67b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 08 10:41:45 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:39 2012 +1000" }, "message": "drm/nve0/fifo: initial implementation\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d0f3c7e41d30859a638083654002b9b6faf7f67b", "tree": "b4dcdcbd755dd8eb28dfc7e3823c5eb36456b94e", "parents": [ "78c20186581c7558429b591fb2942be44b47d59f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Mar 27 15:15:18 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:38 2012 +1000" }, "message": "drm/nouveau: give a slightly larger pci(e)gart aperture on all chipsets\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "78c20186581c7558429b591fb2942be44b47d59f", "tree": "44eb50599b8142f1a3a8088bf5db3e9ec879763b", "parents": [ "9d6ba0b58c5f1ea52b641c36178a27e876b80011" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 06 16:20:30 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:36 2012 +1000" }, "message": "drm/nouveau/pm: some more delays for ddr3 reclocking\n\nThese numbers from the binary driver\u0027s daemon scripts, and fix the transition\nto perflvl 3 on my T510.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "9d6ba0b58c5f1ea52b641c36178a27e876b80011", "tree": "5fa36a7f06d3630962e277d2305086978d42c118", "parents": [ "a94ba1fcac417d0b72f73fb77e730279ca9203c3" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 06 13:51:30 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:34 2012 +1000" }, "message": "drm/nvc0/pm: very initial mclk freq change\n\nLoads of magic missing, this will probably blow up if you try it.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a94ba1fcac417d0b72f73fb77e730279ca9203c3", "tree": "0c2b1683eda459d20b5df9c661ed0a629327b878", "parents": [ "6b91d6b056ba39633cbdf24b9973df4ac99d7130" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 06 11:42:29 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:32 2012 +1000" }, "message": "drm/nvd9/pm: oops, fix timing calc\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "6b91d6b056ba39633cbdf24b9973df4ac99d7130", "tree": "e0bc270e0e4e93e160bf5d5df31f070aaa46e573", "parents": [ "a1da205f4203811978ceb4721bfc3728b473bad7" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 06 11:34:20 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:30 2012 +1000" }, "message": "drm/nvc0/pm: enable mpll src pll, and calc mpll coefficients\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a1da205f4203811978ceb4721bfc3728b473bad7", "tree": "2a48daeeb5e64c01e78b440f497618ea46bbfb7b", "parents": [ "19a1e47799fcce3ef9fb8aa58729e0ad7ac3c268" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Feb 01 09:00:57 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:29 2012 +1000" }, "message": "drm/nvc0/pm: start filling in memory reclocking stubs\n" }, { "commit": "19a1e47799fcce3ef9fb8aa58729e0ad7ac3c268", "tree": "4d2e851bae44fc9f4bc4a547ab0571c15f438bc0", "parents": [ "2b20fd0ab497df5284743975e4204c1c2b03a397" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 06 09:58:09 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:27 2012 +1000" }, "message": "drm/nva3/pm: another few magic regs, and slightly better 0x004018 handling\n\nNot entirely convinced 0x004018 transitions are correct yet, but, it\u0027s\nan improvement.\n\nThe 750MHz value comes from fiddling with the binary driver + coolbits on\ntwo different DDR3 NVA8 chipsets (T510 NVS3100M, and NVS300), not a clue\nwhere this number comes from.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "2b20fd0ab497df5284743975e4204c1c2b03a397", "tree": "9bb0d7112b43b1442e996ab0f9fbac8c32257511", "parents": [ "5f54d29ee9dace1e2ef4e8c9873ad4dd7a06d11a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Feb 03 10:34:33 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:25 2012 +1000" }, "message": "drm/nva3/pm: initial attempt at handling 111100/111104\n\nProbably not quite right, but this is enough now to make NVS300 reclock\nbetween all 3 of its perflvls correctly.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "5f54d29ee9dace1e2ef4e8c9873ad4dd7a06d11a", "tree": "18320c04c83f01d5c801b8a2f81dab2ce79935ee", "parents": [ "001a3990f6f767d364edab3c4b01a9ce4dde9cda" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Feb 03 10:02:03 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:23 2012 +1000" }, "message": "drm/nva3/pm: make pll-\u003epll mode work\n\nThis probably wants a cleanup, but I\u0027m holding off until I know for sure\nhow the rest of the things that need doing fit together.\n\nTested on NVS300 by hacking up perflvl 1 to require PLL mode, and switching\nbetween perflvl 3 and 1.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "001a3990f6f767d364edab3c4b01a9ce4dde9cda", "tree": "556152e15c279871b4aaefb01a5df1033d57eafe", "parents": [ "4719b55be5d43420b29e48c17208ec3db66e730f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Feb 02 15:07:13 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:21 2012 +1000" }, "message": "drm/nva3/pm: attempt to bash a few 0x100200 bits correctly\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "4719b55be5d43420b29e48c17208ec3db66e730f", "tree": "9077de3101181dd8c957b26e5aa6572f9ad84dca", "parents": [ "30e533900ea74a3499dad5c4660ebaf80b50d152" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Feb 02 11:43:31 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:20 2012 +1000" }, "message": "drm/nva3/pm: begin to restructure memory clock changes + another magic\n\nThe binary driver appears to do various bits and pieces of the memory\nclock frequency change at different times, depending on the particular\ntransition that\u0027s occuring. I\u0027ve attempted to replicate this here\nfor div-\u003epll, pll-\u003ediv and div-\u003ediv transitions.\n\nWith some additional (patches upcoming) magic regs being bashed, this\nallows me to correctly transition between all 3 perflvls on NVS300.\n\npll-\u003epll transitions will *not* work correctly at the moment, pending\nme tricking the binary driver into doing one and seeing how to correctly\nhandle it.\n\nThis patch also handles (hopefully) 0x1110e0, which appears to need\nchanging depending on whether in PLL or divider mode.. Maybe. We\u0027ll\nsee.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "30e533900ea74a3499dad5c4660ebaf80b50d152", "tree": "ecacddf07fc3e3df6ab19960a5e2f293ef90d1c1", "parents": [ "27740383dde9e1f309a74cf39d96f3223dbf281c" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 27 13:26:52 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:18 2012 +1000" }, "message": "drm/nva3/pm: more random unknown PFB regs\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "27740383dde9e1f309a74cf39d96f3223dbf281c", "tree": "e34637989d61d6a16763a7ce0d5bcccdc8a7e8c6", "parents": [ "65115bb05a9380a256907ae307135248ac1c29b4" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 27 10:53:17 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:16 2012 +1000" }, "message": "drm/nva3/pm: initial attempt at more magic PFB regs\n\nThe reg calculation may get moved elsewhere at some point, but lets\nfigure out what exactly we need to do first.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "65115bb05a9380a256907ae307135248ac1c29b4", "tree": "a7a37c77e2c3007e6038d97d4eb5b02416e9bc5e", "parents": [ "074e747a6d371192419fb5abeabb9686d0cf24a5" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Jan 25 16:02:58 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:14 2012 +1000" }, "message": "drm/nva3/pm: hook up to ram reclocking helper\n\nThis gets us a start on memory timings.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "074e747a6d371192419fb5abeabb9686d0cf24a5", "tree": "d41c0ed9c29abf7d6acb7fb3f0bcf4fe0cff3102", "parents": [ "41ceeeb25d5be06660a040e2fc99d6405dfc07f8" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sat Dec 17 14:02:51 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu May 24 16:31:12 2012 +1000" }, "message": "drm/nva3/pm: introduce more paranoia\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d5b4bb4d103cd601d8009f2d3a7e44586c9ae7cc", "tree": "0f3b6da2b66fc7a4278764982279c2815c913010", "parents": [ "c80ddb526331a72c9e9d1480f85f6fd7c74e3d2d", "bb8187d35f820671d6dd76700d77a6b55f95e2c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "message": "Merge branch \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull the MCA deletion branch from Paul Gortmaker:\n \"It was good that we could support MCA machines back in the day, but\n realistically, nobody is using them anymore. They were mostly limited\n to 386-sx 16MHz CPU and some 486 class machines and never more than\n 64MB of RAM. Even the enthusiast hobbyist community seems to have\n dried up close to ten years ago, based on what you can find searching\n various websites dedicated to the relatively short lived hardware.\n\n So lets remove the support relating to CONFIG_MCA. There is no point\n carrying this forward, wasting cycles doing routine maintenance on it;\n wasting allyesconfig build time on validating it, wasting I/O on git\n grep\u0027ping over it, and so on.\"\n\nLet\u0027s see if anybody screams. It generally has compiled, and James\nBottomley pointed out that there was a MCA extension from NCR that\nallowed for up to 4GB of memory and PPro-class machines. So in *theory*\nthere may be users out there.\n\nBut even James (technically listed as a maintainer) doesn\u0027t actually\nhave a system, and while Alan Cox claims to have a machine in his cellar\nthat he offered to anybody who wants to take it off his hands, he didn\u0027t\nargue for keeping MCA support either.\n\nSo we could bring it back. But somebody had better speak up and talk\nabout how they have actually been using said MCA hardware with modern\nkernels for us to do that. And David already took the patch to delete\nall the networking driver code (commit a5e371f61ad3: \"drivers/net:\ndelete all code/drivers depending on CONFIG_MCA\").\n\n* \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n MCA: delete all remaining traces of microchannel bus support.\n scsi: delete the MCA specific drivers and driver code\n serial: delete the MCA specific 8250 support.\n arm: remove ability to select CONFIG_MCA\n" }, { "commit": "c80ddb526331a72c9e9d1480f85f6fd7c74e3d2d", "tree": "0212803a009f171990032abb94fad84156baa153", "parents": [ "2c13bc0f8f0d3e13b42be70bf74fec8e56b58324", "1dff2b87a34a1ac1d1898ea109bf97ed396aca53" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:08:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:08:40 2012 -0700" }, "message": "Merge tag \u0027md-3.5\u0027 of git://neil.brown.name/md\n\nPull md updates from NeilBrown:\n \"It\u0027s been a busy cycle for md - lots of fun stuff here.. if you like\n this kind of thing :-)\n\n Main features:\n - RAID10 arrays can be reshaped - adding and removing devices and\n changing chunks (not \u0027far\u0027 array though)\n - allow RAID5 arrays to be reshaped with a backup file (not tested\n yet, but the priciple works fine for RAID10).\n - arrays can be reshaped while a bitmap is present - you no longer\n need to remove it first\n - SSSE3 support for RAID6 syndrome calculations\n\n and of course a number of minor fixes etc.\"\n\n* tag \u0027md-3.5\u0027 of git://neil.brown.name/md: (56 commits)\n md/bitmap: record the space available for the bitmap in the superblock.\n md/raid10: Remove extras after reshape to smaller number of devices.\n md/raid5: improve removal of extra devices after reshape.\n md: check the return of mddev_find()\n MD RAID1: Further conditionalize \u0027fullsync\u0027\n DM RAID: Use md_error() in place of simply setting Faulty bit\n DM RAID: Record and handle missing devices\n DM RAID: Set recovery flags on resume\n md/raid5: Allow reshape while a bitmap is present.\n md/raid10: resize bitmap when required during reshape.\n md: allow array to be resized while bitmap is present.\n md/bitmap: make sure reshape request are reflected in superblock.\n md/bitmap: add bitmap_resize function to allow bitmap resizing.\n md/bitmap: use DIV_ROUND_UP instead of open-code\n md/bitmap: create a \u0027struct bitmap_counts\u0027 substructure of \u0027struct bitmap\u0027\n md/bitmap: make bitmap bitops atomic.\n md/bitmap: make _page_attr bitops atomic.\n md/bitmap: merge bitmap_file_unmap and bitmap_file_put.\n md/bitmap: remove async freeing of bitmap file.\n md/bitmap: convert some spin_lock_irqsave to spin_lock_irq\n ...\n" }, { "commit": "2c13bc0f8f0d3e13b42be70bf74fec8e56b58324", "tree": "92d629d732b5633baeddb9dd51d9e53334da254d", "parents": [ "0bd3fbd4abeafa19ae0302d25194468b022d1a56", "a511ce3397803558a3591e55423f3ae6aa28c9db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 16:52:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 16:52:27 2012 -0700" }, "message": "Merge branch \u0027sbp-target-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nPull sbp-2 (firewire) target mode support from Nicholas Bellinger:\n \"The FireWire SBP-2 Target is a driver for using an IEEE-1394\n connection as a SCSI transport. This module uses the SCSI Target\n framework to expose LUNs to other machines attached to a FireWire bus,\n in effect acting as a FireWire hard disk similar to FireWire Target\n Disk mode on many Apple computers.\n\n Also included are the two drivers/firewire/ patches required by\n sbp-target to access fw_request fabric speed needed for mgt_agent\n TCODE_WRITE_BLOCK_REQUEST ops, and exporting fw_card kref logic used\n when creating/destroying active session references to individual\n endpoints.\n\n A credit goes to Chris in being able to get this code up and running\n so quickly w/o any target core changes, and special thanks goes out to\n Stefan Richter + Clemens Ladisch + Andy Grover for their help in\n getting this driver ready for mainline. Also, one of Chris\u0027s goals\n was to be able to connect sbp-target to a PowerPC based MacOS-X based\n client, that he accomplished along the way in this obligatory\n screenshot:\n\n http://linux-iscsi.org/wiki/File:Linux-fireware-target-bootc-macosx.png\n\n Great work Chris + linux-1394 team !!\"\n\nAcked-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n\n* \u0027sbp-target-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:\n sbp-target: Initial merge of firewire/ieee-1394 target mode support\n firewire: Move fw_card kref functions into linux/firewire.h\n firewire: Add function to get speed from opaque struct fw_request\n" }, { "commit": "0bd3fbd4abeafa19ae0302d25194468b022d1a56", "tree": "1fc34b25666c97b85dfb7199e48b2e074ffde264", "parents": [ "0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8", "ef45b834319f8a18f257a40ba4bce6b829ef1708" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:59:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:59:10 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto updates from Herbert Xu:\n - New cipher/hash driver for ARM ux500.\n - Code clean-up for aesni-intel.\n - Misc fixes.\n\nFixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite\nfrankly some of it made no sense at all (the pull brought in a\ndeclaration for the dbx500_add_platform_device_noirq() function, which\nneither exists nor is used anywhere).\n\nAlso some trivial add-add context conflicts in the Kconfig file in\ndrivers/{char/hw_random,crypto}/\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: aesni-intel - move more common code to ablk_init_common\n crypto: aesni-intel - use crypto_[un]register_algs\n crypto: ux500 - Cleanup hardware identification\n crypto: ux500 - Update DMA handling for 3.4\n mach-ux500: crypto - core support for CRYP/HASH module.\n crypto: ux500 - Add driver for HASH hardware\n crypto: ux500 - Add driver for CRYP hardware\n hwrng: Kconfig - modify default state for atmel-rng driver\n hwrng: omap - use devm_request_and_ioremap\n crypto: crypto4xx - move up err_request_irq label\n crypto, xor: Sanitize checksumming function selection output\n crypto: caam - add backward compatible string sec4.0\n" }, { "commit": "0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8", "tree": "cc5ddfd411bc9c5d6fb828b86eba92f50294805e", "parents": [ "59d0952b43552570e0f1c3ff91ebb16d4caec171", "cad19fa66469d2a745fae0c168833d5d33d64489" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:42:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:42:42 2012 -0700" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull first set of watchdog updates from Wim Van Sebroeck:\n \"This pull contains:\n\n - The removal of ixp2000_wdt\n - The addition of ie6xx_wdt\n - Some documentation fixes\n - Small fixes and improvements\n\n (Note: Part 2 will contain generic watchdog core changes + conversion\n of some more drivers)\"\n\n* git://www.linux-watchdog.org/linux-watchdog:\n Documentation/watchdog: Fix the file descriptor leak when no cmdline arg given\n Documentation/watchdog: close the fd when cmdline arg given\n Documentation/watchdog: Fix a small typo\n watchdog: s3c2410_wdt: Set timeout to actually achieved timeout\n watchdog: wm831x: Convert to gpio_request_one()\n watchdog: via_wdt: depends on PCI\n watchdog: ie6xx_wdt needs io.h\n watchdog: ie6xx_wdt.c: fix printk format warning\n watchdog: Add watchdog driver for Intel Atom E6XX\n watchdog: it87_wdt: Add support for IT8728F watchdog.\n watchdog: i6300esb: don\u0027t depend on X86\n watchdog: Use module_pci_driver\n watchdog: sch311x_wdt.c: Remove RESGEN\n watchdog: s3c2410-wdt: Use of_match_ptr().\n watchdog: Device tree support for pnx4008-wdt\n watchdog: ar7_wdt.c: use devm_request_and_ioremap\n watchdog: remove ixp2000 driver\n watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL pointer\n" }, { "commit": "59d0952b43552570e0f1c3ff91ebb16d4caec171", "tree": "0f953329b6667b64c7758e694fe50b212806cc59", "parents": [ "1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6", "2fff27512600f9ad91335577e485a8552edb0abf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:27:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:27:39 2012 -0700" }, "message": "Merge tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\nPull libata update from Jeff Garzik:\n \"Changes, all of them boring and minor:\n\n 1) Ugly MSFT Hyper-V workaround in ata_piix\n\n 2) Fix a longstanding error recovery delay caused by excessive\n re-re-retries, when media errors occur.\n\n 3) Minor hw-specific workarounds and quirks\n\n 4) New PATA driver for ep93xx\"\n\n* tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n PATA host controller driver for ep93xx\n [libata] Add \" 2GB ATA Flash Disk\"/\"ADMA428M\" to DMA blacklist\n ata_generic: Skip is_intel_ider() check when ata_generic\u003d1 is set\n libata-eh don\u0027t waste time retrying media errors (v3)\n ata_piix: defer disks to the Hyper-V drivers by default\n libata: add a host flag to ignore detected ATA devices\n" }, { "commit": "1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6", "tree": "bf85658f7c5a2c86da3bc613d7fea13bbffe4e72", "parents": [ "468f4d1a855f8039dabf441b8bf68cae264033ff", "4573acbc461b8089198500cee06ef0cdc5b70e82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:15:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:15:09 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon updates from Guenter Roeck:\n \"New driver for INA219 and INA226, added support for IT8782F and\n IT8783E/F to it87 driver, plus cleanups in a couple of drivers.\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (it87) Make temp3 attribute conditional for IT8782F\n hwmon: (it87) Convert to use devm_kzalloc and devm_request_region\n hwmon: INA219 and INA226 support\n hwmon: (it87) Create voltage attributes only if voltage is enabled\n hwmon: (ntc_thermistor) Fix checkpatch warning\n hwmon: (ntc_thermistor) Optimize and fix build warning\n hwmon: (ntc_thermistor) Return error code from hwmon_device_register\n hwmon: (ntc_thermistor) Convert to devm_kzalloc\n hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT\n acpi_power_meter: clean up code around setup_attrs\n acpi_power_meter: drop meter_rw_attrs, use common meter_attrs\n acpi_power_meter: remove duplicate code between register_{ro,rw}_attrs\n acpi_power_meter: use a {RW,RO}_SENSOR_TEMPLATE macro to clean things up\n acpi_power_meter: use the same struct {rw,ro}_sensor_template for both\n hwmon: use module_pci_driver\n hwmon: (it87) Add support for IT8782F and IT8783E/F\n" }, { "commit": "468f4d1a855f8039dabf441b8bf68cae264033ff", "tree": "303ac5bc1ac3f86f136a30f9356e84f20dcbf13f", "parents": [ "eb2689e06b3526c7684b09beecf26070f05ee825", "8714c8d74d313c3ba27bf9c2aaacb1ad71c644f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:07:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:07:06 2012 -0700" }, "message": "Merge tag \u0027pm-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management updates from Rafael Wysocki:\n\n - Implementation of opportunistic suspend (autosleep) and user space\n interface for manipulating wakeup sources.\n\n - Hibernate updates from Bojan Smojver and Minho Ban.\n\n - Updates of the runtime PM core and generic PM domains framework\n related to PM QoS.\n\n - Assorted fixes.\n\n* tag \u0027pm-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (25 commits)\n epoll: Fix user space breakage related to EPOLLWAKEUP\n PM / Domains: Make it possible to add devices to inactive domains\n PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format\n PM / Domains: Fix computation of maximum domain off time\n PM / Domains: Fix link checking when add subdomain\n PM / Sleep: User space wakeup sources garbage collector Kconfig option\n PM / Sleep: Make the limit of user space wakeup sources configurable\n PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo\n PM / Domains: Cache device stop and domain power off governor results, v3\n PM / Domains: Make device removal more straightforward\n PM / Sleep: Fix a mistake in a conditional in autosleep_store()\n epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready\n PM / QoS: Create device constraints objects on notifier registration\n PM / Runtime: Remove device fields related to suspend time, v2\n PM / Domains: Rework default domain power off governor function, v2\n PM / Domains: Rework default device stop governor function, v2\n PM / Sleep: Add user space interface for manipulating wakeup sources, v3\n PM / Sleep: Add \"prevent autosleep time\" statistics to wakeup sources\n PM / Sleep: Implement opportunistic sleep, v2\n PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepoints\n ...\n" }, { "commit": "eb2689e06b3526c7684b09beecf26070f05ee825", "tree": "cf55297c4c960eb07c815620c65628201138c839", "parents": [ "2e341ca686042aa464efa755447e7bcee91d1eb6", "18d5eacb52291faaa430fc50b435b3bb204dba88" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:11:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:11:07 2012 -0700" }, "message": "Merge tag \u0027regmap-domain-deps\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull a regmap kconfig dependency fix from Mark Brown:\n \"Fix the dependency on IRQ_DOMAIN for REGMAP_IRQ in the core\n\n Fixes a missing select from the Palmas driver a bit more throoughly.\"\n\n* tag \u0027regmap-domain-deps\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:\n regmap: Use select .. if to get IRQ_DOMAIN enabled\n" }, { "commit": "2e341ca686042aa464efa755447e7bcee91d1eb6", "tree": "c6b16b6b6a6e871fa04396cb2c7eb759bcad5be3", "parents": [ "927ad551031798d4cba49766549600bbb33872d7", "85e184e4c3cd3e2285ceab91ff8f0cac094e8a85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:05:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:05:43 2012 -0700" }, "message": "Merge tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound updates from Takashi Iwai:\n \"This is the first big chunk for 3.5 merges of sound stuff.\n\n There are a few big changes in different areas. First off, the\n streaming logic of USB-audio endpoints has been largely rewritten for\n the better support of \"implicit feedback\". If anything about USB got\n broken, this change has to be checked.\n\n For HD-audio, the resume procedure was changed; instead of delaying\n the resume of the hardware until the first use, now waking up\n immediately at resume. This is for buggy BIOS.\n\n For ASoC, dynamic PCM support and the improved support for digital\n links between off-SoC devices are major framework changes.\n\n Some highlights are below:\n\n * HD-audio\n - Avoid accesses of invalid pin-control bits that may stall the codec\n - V-ref setup cleanups\n - Fix the races in power-saving code\n - Fix the races in codec cache hashes and connection lists\n - Split some common codes for BIOS auto-parser to hda_auto_parser.c\n - Changed the PM resume code to wake up immediately for buggy BIOS\n - Creative SoundCore3D support\n - Add Conexant CX20751/2/3/4 codec support\n\n * ASoC\n - Dynamic PCM support, allowing support for SoCs with internal\n routing through components with tight sequencing and formatting\n constraints within their internal paths or where there are multiple\n components connected with CPU managed DMA controllers inside the\n SoC.\n - Greatly improved support for direct digital links between off-SoC\n devices, providing a much simpler way of connecting things like\n digital basebands to CODECs.\n - Much more fine grained and robust locking, cleaning up some of the\n confusion that crept in with multi-component.\n - CPU support for nVidia Tegra 30 I2S and audio hub controllers and\n ST-Ericsson MSP I2S controolers\n - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,\n Texas Instruments LM49453.\n - Some regmap changes needed by the Tegra I2S driver.\n - mc13783 audio support.\n\n * Misc\n - Rewrite with module_pci_driver()\n - Xonar DGX support for snd-oxygen\n - Improvement of packet handling in snd-firewire driver\n - New USB-endpoint streaming logic\n - Enhanced M-audio FTU quirks and relevant cleanups\n - Increment the support of OSS devices to 256\n - snd-aloop accuracy improvement\n\n There are a few more pending changes for 3.5, but they will be sent\n slightly later as partly depending on the changes of DRM.\"\n\nFix up conflicts in regmap (due to duplicate patches, with some further\nupdates then having already come in from the regmap tree). Also some\nfairly trivial context conflicts in the imx and mcx soc drivers.\n\n* tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)\n ALSA: snd-usb: fix stream info output in /proc\n ALSA: pcm - Add proper state checks to snd_pcm_drain()\n ALSA: sh: Fix up namespace collision in sh_dac_audio.\n ALSA: hda/realtek - Fix unused variable compile warning\n ASoC: sh: fsi: enable chip specific data transfer mode\n ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()\n ASoC: sh: fsi: use same format for IN/OUT\n ASoC: sh: fsi: add fsi_version() and removed meaningless version check\n ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC\n ASoC: tegra: Add machine driver for WM8753 codec\n ALSA: hda - Fix possible races of accesses to connection list array\n ASoC: OMAP: HDMI: Introduce codec\n ARM: mx31_3ds: Add sound support\n ASoC: imx-mc13783 cleanup\n mx31moboard: Add sound support\n ASoC: mc13783 codec cleanups\n ASoC: add imx-mc13783 sound support\n ASoC: Add mc13783 codec\n mfd: mc13xxx: add codec platform data\n ASoC: don\u0027t flip master of DT-instantiated DAI links\n ...\n" }, { "commit": "44bc40e1489622234169786b0ad5a1f4a01e1090", "tree": "cd247a6f130b8993e92ac62f76ced2b023491d09", "parents": [ "02171b4a7c5b555d08c3321332e0c45776518276", "ead91d4b8c3b1fb08a73aaa4a191230ecf717ee0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 11:16:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 11:16:40 2012 -0700" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 platform changes from Ingo Molnar:\n \"This tree includes assorted platform driver updates and a preparatory\n series for a platform with custom DMA remapping semantics (sta2x11 I/O\n hub).\"\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/vsmp: Fix number of CPUs when vsmp is disabled\n keyboard: Use BIOS Keyboard variable to set Numlock\n x86/olpc/xo1/sci: Report RTC wakeup events\n x86/olpc/xo1/sci: Produce wakeup events for buttons and switches\n x86, platform: Initial support for sta2x11 I/O hub\n x86: Introduce CONFIG_X86_DMA_REMAP\n x86-32: Introduce CONFIG_X86_DEV_DMA_OPS\n" }, { "commit": "6f73b3629f774c6cba589b15fd095112b25ca923", "tree": "50a60feae71cb5f40078f552b9b08468bc7b29c9", "parents": [ "3a8580f82024e30b31c662aa49346adf7a3bcdb5", "2074b1d9d53ae696dd3f49482bad43254f40f01d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:02:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:02:42 2012 -0700" }, "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 \"Here are the powerpc goodies for 3.5. Main highlights are:\n\n - Support for the NX crypto engine in Power7+\n - A bunch of Anton goodness, including some micro optimization of our\n syscall entry on Power7\n - I converted a pile of our thermal control drivers to the new i2c\n APIs (essentially turning the old therm_pm72 into a proper set of\n windfarm drivers). That\u0027s one more step toward removing the\n deprecated i2c APIs, there\u0027s still a few drivers to fix, but we are\n getting close\n - kexec/kdump support for 47x embedded cores\n\n The big missing thing here is no updates from Freescale. Not sure\n what\u0027s up here, but with Kumar not working for them anymore things are\n a bit in a state of flux in that area.\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)\n powerpc: Fix irq distribution\n Revert \"powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags\"\n powerpc: Fixing a cputhread code documentation\n powerpc/crypto: Enable the PFO-based encryption device\n powerpc/crypto: Build files for the nx device driver\n powerpc/crypto: debugfs routines and docs for the nx device driver\n powerpc/crypto: SHA512 hash routines for nx encryption\n powerpc/crypto: SHA256 hash routines for nx encryption\n powerpc/crypto: AES-XCBC mode routines for nx encryption\n powerpc/crypto: AES-GCM mode routines for nx encryption\n powerpc/crypto: AES-ECB mode routines for nx encryption\n powerpc/crypto: AES-CTR mode routines for nx encryption\n powerpc/crypto: AES-CCM mode routines for nx encryption\n powerpc/crypto: AES-CBC mode routines for nx encryption\n powerpc/crypto: nx driver code supporting nx encryption\n powerpc/pseries: Enable the PFO-based RNG accelerator\n powerpc/pseries/hwrng: PFO-based hwrng driver\n powerpc/pseries: Add PFO support to the VIO bus\n powerpc/pseries: Add pseries update notifier for OFDT prop changes\n powerpc/pseries: Add new hvcall constants to support PFO\n ...\n" }, { "commit": "1d767cae4dbd4116fc3b2cc3251a20760f98339f", "tree": "79a1a48a67a9b4296ce062d61ee863fe7a46c77f", "parents": [ "6101167727932a929e37fb8a6eeb68bdbf54d58e", "5f19f14fed7786652b9617c633db101d26a42251" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:00:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:00:40 2012 -0700" }, "message": "Merge tag \u0027sh-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\nPull SuperH updates from Paul Mundt:\n - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A)\n - New boards: RSK2+SH7264, RSK2+SH7269\n - Unbreaking kgdb for SMP\n - Consolidation of _32/_64 page fault handling.\n - watchdog and legacy DMA chainsawing, part 1\n - Conversion to evt2irq() hwirq lookup, to support relocation of\n vectored IRQs for irqdomains.\n\n* tag \u0027sh-for-linus\u0027 of git://github.com/pmundt/linux-sh: (98 commits)\n sh: intc: Kill off special reservation interface.\n sh: Enable PIO API for hp6xx and se770x.\n sh: Kill off machvec IRQ hinting.\n sh: dma: More legacy cpu dma chainsawing.\n sh: Kill off MAX_DMA_ADDRESS leftovers.\n sh: Tidy up some of the cpu legacy dma header mess.\n sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.\n sh64: Fix up vmalloc fault range check.\n Revert \"sh: Ensure fixmap and store queue space can co-exist.\"\n serial: sh-sci: Fix for port types without BRI interrupts.\n sh: legacy PCI evt2irq migration.\n sh: cpu dma evt2irq migration.\n sh: sh7763rdp evt2irq migration.\n sh: sdk7780 evt2irq migration.\n sh: migor evt2irq migration.\n sh: landisk evt2irq migration.\n sh: kfr2r09 evt2irq migration.\n sh: ecovec24 evt2irq migration.\n sh: ap325rxa evt2irq migration.\n sh: urquell evt2irq migration.\n ...\n" }, { "commit": "5f2430f554aabb4810b2a6f906be571ac1241d96", "tree": "061e277f6d580d8d2cb77866669628838b5b3a29", "parents": [ "abcf834b80eefb2ded56254ce7de94d2ab258d22" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Fri May 11 12:00:27 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:26:20 2012 +0200" }, "message": "watchdog: s3c2410_wdt: Set timeout to actually achieved timeout\n\nWhile rebasing my \"watchdog_dev: Let the driver update the timeout field on\nset_timeout success\" patch (before I noticed it was already picked up by Wim),\nI noticed that the s3c2410_wdt driver may not always have a 1 second\nresolution, this patch changes s3c2410wdt_set_heartbeat to update the\ntimeout to the actually achieved timeout.\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "abcf834b80eefb2ded56254ce7de94d2ab258d22", "tree": "bbf55c2b1a272281069ff45b87869214f012277b", "parents": [ "690e7a706da6cb1af0363529603048ef3fce9e82" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sun May 13 23:42:55 2012 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:26:07 2012 +0200" }, "message": "watchdog: wm831x: Convert to gpio_request_one()\n\nUse the more modern API.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "690e7a706da6cb1af0363529603048ef3fce9e82", "tree": "9618460fc08cd6c65503f1638f07e0d6a6d156f3", "parents": [ "491d9e2a5f0e845a91ef53065afb4805a668d80d" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Fri May 11 16:37:22 2012 -0700" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:25:59 2012 +0200" }, "message": "watchdog: via_wdt: depends on PCI\n\nvia_wdt is a PCI driver so it should depend on PCI so that\nit will not cause build errors.\n\ndrivers/watchdog/via_wdt.c:256:1: warning: data definition has no type or storage class\ndrivers/watchdog/via_wdt.c:256:1: warning: type defaults to \u0027int\u0027 in declaration of \u0027module_pci_driver\u0027\ndrivers/watchdog/via_wdt.c:256:1: warning: parameter names (without types) in function declaration\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "491d9e2a5f0e845a91ef53065afb4805a668d80d", "tree": "ddbbbc1e651cb2d9bc2cac01dcfa1443cc525ee4", "parents": [ "744f6f4d3db2e9f153c9381b169aaee5c6ad4187" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Mon May 14 13:14:29 2012 -0700" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:25:33 2012 +0200" }, "message": "watchdog: ie6xx_wdt needs io.h\n\nFix build error by including \u003clinux/io.h\u003e:\n\ndrivers/watchdog/ie6xx_wdt.c:97:2: error: implicit declaration of function \u0027outb\u0027\ndrivers/watchdog/ie6xx_wdt.c:133:2: error: implicit declaration of function \u0027outl\u0027\ndrivers/watchdog/ie6xx_wdt.c:161:2: error: implicit declaration of function \u0027inb\u0027\ndrivers/watchdog/ie6xx_wdt.c:199:3: error: implicit declaration of function \u0027inl\u0027\ndrivers/watchdog/ie6xx_wdt.c:203:3: error: implicit declaration of function \u0027inw\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "744f6f4d3db2e9f153c9381b169aaee5c6ad4187", "tree": "12cf22dd7e3b6255972c15bf9a53ee110a1c41a3", "parents": [ "101ce87b3bdd5352edceb5a079e765685c13dbc3" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Fri May 11 18:33:31 2012 -0700" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:25:29 2012 +0200" }, "message": "watchdog: ie6xx_wdt.c: fix printk format warning\n\nFix printk format warning; use cast to u64 since resource_size_t can\nbe either u32 or u64.\n\ndrivers/watchdog/ie6xx_wdt.c:261:4: warning: format \u0027%x\u0027 expects type \u0027unsigned int\u0027, but argument 3 has type \u0027resource_size_t\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "101ce87b3bdd5352edceb5a079e765685c13dbc3", "tree": "1e903fbec1cfb078712fd3917e9f6511d03b43af", "parents": [ "198ca0153412a97e968b5deb67d789000faef129" ], "author": { "name": "Alexander Stein", "email": "alexander.stein@systec-electronic.com", "time": "Thu May 10 16:37:43 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:25:13 2012 +0200" }, "message": "watchdog: Add watchdog driver for Intel Atom E6XX\n\nAdd driver for the watchdog timer built into the\nIntel Atom E6XX (TunnelCreek) processor.\n\nSigned-off-by: Alexander Stein \u003calexander.stein@systec-electronic.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "198ca0153412a97e968b5deb67d789000faef129", "tree": "4651b89925ae5c635ece460537478d16b3e225f3", "parents": [ "7050bd54997a1606377a1985b508a145ea8c1555" ], "author": { "name": "Diego Elio Pettenò", "email": "flameeyes@flameeyes.eu", "time": "Wed Mar 14 20:49:04 2012 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:24:43 2012 +0200" }, "message": "watchdog: it87_wdt: Add support for IT8728F watchdog.\n\nThis works the same way IT8721F works, but it supports WDT_PWROK\n(checked on the datasheet).\n\nSigned-off-by: Diego Elio Pettenò \u003cflameeyes@flameeyes.eu\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "7050bd54997a1606377a1985b508a145ea8c1555", "tree": "16187c46f5991eaf8c5226c2db5d10699da7cfc1", "parents": [ "5ce9c371c788638890980b27f0cd8af7071b3a50" ], "author": { "name": "Michael Olbrich", "email": "m.olbrich@pengutronix.de", "time": "Sun Apr 08 13:56:06 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:24:32 2012 +0200" }, "message": "watchdog: i6300esb: don\u0027t depend on X86\n\ni6300esb is on of the watchdogs QEMU can emulate. It is also available\nwhen emulating ARM. The driver works without problems and is quite\nuseful to test userspace dealing with /dev/watchdog.\n\nSigned-off-by: Michael Olbrich \u003cm.olbrich@pengutronix.de\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" } ], "next": "5ce9c371c788638890980b27f0cd8af7071b3a50" }