)]}' { "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": "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": "ece78b7df734726e790dcab207f463401ff80440", "tree": "4a0b23c28c6a727d5eebc8a88a22fe3720c425fd", "parents": [ "07acfc2a9349a8ce45b236c2624dad452001966b", "0324876628a9c7faf8127e20af29373dc6dec876" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:14:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:14:59 2012 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\nPull ext2, ext3 and quota fixes from Jan Kara:\n \"Interesting bits are:\n - removal of a special i_mutex locking subclass (I_MUTEX_QUOTA) since\n quota code does not need i_mutex anymore in any unusual way.\n - backport (from ext4) of a fix of a checkpointing bug (missing cache\n flush) that could lead to fs corruption on power failure\n\n The rest are just random small fixes \u0026 cleanups.\"\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n ext2: trivial fix to comment for ext2_free_blocks\n ext2: remove the redundant comment for ext2_export_ops\n ext3: return 32/64-bit dir name hash according to usage type\n quota: Get rid of nested I_MUTEX_QUOTA locking subclass\n quota: Use precomputed value of sb_dqopt in dquot_quota_sync\n ext2: Remove i_mutex use from ext2_quota_write()\n reiserfs: Remove i_mutex use from reiserfs_quota_write()\n ext4: Remove i_mutex use from ext4_quota_write()\n ext3: Remove i_mutex use from ext3_quota_write()\n quota: Fix double lock in add_dquot_ref() with CONFIG_QUOTA_DEBUG\n jbd: Write journal superblock with WRITE_FUA after checkpointing\n jbd: protect all log tail updates with j_checkpoint_mutex\n jbd: Split updating of journal superblock and marking journal empty\n ext2: do not register write_super within VFS\n ext2: Remove s_dirt handling\n ext2: write superblock only once on unmount\n ext3: update documentation with barrier\u003d1 default\n ext3: remove max_debt in find_group_orlov()\n jbd: Refine commit writeout logic\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": "ce004178be1bbaa292e9e6497939e2970300095a", "tree": "1cd5306548947deaedd612189b56d35265217e8e", "parents": [ "9978306e31a8f89bd81fbc4c49fd9aefb1d30d10", "c5389831cda3b38a56606a348a537a1332f2d729" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 15:10:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 15:10:28 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull sparc changes from David S. Miller:\n \"This has the generic strncpy_from_user() implementation architectures\n can now use, which we\u0027ve been developing on linux-arch over the past\n few days.\n\n For good measure I ran both a 32-bit and a 64-bit glibc testsuite run,\n and the latter of which pointed out an adjustment I needed to make to\n sparc\u0027s user_addr_max() definition. Linus, you were right, STACK_TOP\n was not the right thing to use, even on sparc itself :-)\n\n From Sam Ravnborg, we have a conversion of sparc32 over to the common\n alloc_thread_info_node(), since the aspect which originally blocked\n our doing so (sun4c) has been removed.\"\n\nFix up trivial arch/sparc/Kconfig and lib/Makefile conflicts.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc: Fix user_addr_max() definition.\n lib: Sparc\u0027s strncpy_from_user is generic enough, move under lib/\n kernel: Move REPEAT_BYTE definition into linux/kernel.h\n sparc: Increase portability of strncpy_from_user() implementation.\n sparc: Optimize strncpy_from_user() zero byte search.\n sparc: Add full proper error handling to strncpy_from_user().\n sparc32: use the common implementation of alloc_thread_info_node()\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": "0708500d49e8439d9fe5529795bdc1485f0f46c3", "tree": "2019b8ebcd86c9b593e56ac1d630c921f130c8d3", "parents": [ "be122abe4bcd6d39b37892daae28c8bf5e4030fc", "8d6c1efa51236bb781f202aa13b9f4ba654978c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:57:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:57:18 2012 -0700" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull device tree changes from Grant Likely:\n \"Mostly documentation updates, but also includes an empty stub for\n non-CONFIG_OF builds.\"\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n dt/documentation: Fix value format description\n dt: add vendor prefix for EM Microelectronics\n ARM: DT: Add binding for GIC virtualization extentions (VGIC)\n of/irq: add empty irq_of_parse_and_map() for non-dt builds\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": "b343c8beec664ef6f0e9964d3001c7c7966331ae", "tree": "c61be2147a700ff83704164686e1db23461d0bb3", "parents": [ "745914df47053c758f3d7999dfa82df184c2e5af", "a87487e687ceafdc696b8cb1fb27e37cc463586b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:55:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:55:24 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irqdomain changes from Grant Likely:\n \"Minor changes and fixups for irqdomain infrastructure. The most\n important change adds the ability to remove a registered irqdomain.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n irqdomain: Document size parameter of irq_domain_add_linear()\n irqdomain: trivial pr_fmt conversion.\n irqdomain: Kill off duplicate definitions.\n irqdomain: Make irq_domain_simple_map() static.\n irqdomain: Export remaining public API symbols.\n irqdomain: Support removal of IRQ domains.\n" }, { "commit": "c7523a7c88db637d66841018532cb4b3ab6ab0a8", "tree": "cec08263a493831d43e17d4daa633e2a6b09480e", "parents": [ "2f78d8e249973f1eeb88315e6444e616c60177ae", "b80fe1015be4e3c926d8eb4cc6a340fdd22a43e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer updates from Thomas Gleixner.\n\nVarious trivial conflict fixups in arch Kconfig due to addition of\nunrelated entries nearby. And one slightly more subtle one for sparc32\n(new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)\n timekeeping: Fix a few minor newline issues.\n time: remove obsolete declaration\n ntp: Fix a stale comment and a few stray newlines.\n ntp: Correct TAI offset during leap second\n timers: Fixup the Kconfig consolidation fallout\n x86: Use generic time config\n unicore32: Use generic time config\n um: Use generic time config\n tile: Use generic time config\n sparc: Use: generic time config\n sh: Use generic time config\n score: Use generic time config\n s390: Use generic time config\n openrisc: Use generic time config\n powerpc: Use generic time config\n mn10300: Use generic time config\n mips: Use generic time config\n microblaze: Use generic time config\n m68k: Use generic time config\n m32r: Use generic time config\n ...\n" }, { "commit": "446969084d33a4064a39d280806da642c54ba4ac", "tree": "0887795d96007b228733c9499bda1731d64e48fe", "parents": [ "35c9646062eba15351c6d64ea0c02176e5cb66ac" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 23 20:12:50 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 24 13:10:05 2012 -0700" }, "message": "kernel: Move REPEAT_BYTE definition into linux/kernel.h\n\nAnd make sure that everything using it explicitly includes\nthat header file.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\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": "654443e20dfc0617231f28a07c96a979ee1a0239", "tree": "a0dc3f093eb13892539082e663607c34b4fc2d07", "parents": [ "2c01e7bc46f10e9190818437e564f7e0db875ae9", "9cba26e66d09bf394ae5a739627a1dc8b7cae6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "message": "Merge branch \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull user-space probe instrumentation from Ingo Molnar:\n \"The uprobes code originates from SystemTap and has been used for years\n in Fedora and RHEL kernels. This version is much rewritten, reviews\n from PeterZ, Oleg and myself shaped the end result.\n\n This tree includes uprobes support in \u0027perf probe\u0027 - but SystemTap\n (and other tools) can take advantage of user probe points as well.\n\n Sample usage of uprobes via perf, for example to profile malloc()\n calls without modifying user-space binaries.\n\n First boot a new kernel with CONFIG_UPROBE_EVENT\u003dy enabled.\n\n If you don\u0027t know which function you want to probe you can pick one\n from \u0027perf top\u0027 or can get a list all functions that can be probed\n within libc (binaries can be specified as well):\n\n\t$ perf probe -F -x /lib/libc.so.6\n\n To probe libc\u0027s malloc():\n\n\t$ perf probe -x /lib64/libc.so.6 malloc\n\tAdded new event:\n\tprobe_libc:malloc (on 0x7eac0)\n\n You can now use it in all perf tools, such as:\n\n\tperf record -e probe_libc:malloc -aR sleep 1\n\n Make use of it to create a call graph (as the flat profile is going to\n look very boring):\n\n\t$ perf record -e probe_libc:malloc -gR make\n\t[ perf record: Woken up 173 times to write data ]\n\t[ perf record: Captured and wrote 44.190 MB perf.data (~1930712\n\n\t$ perf report | less\n\n\t 32.03% git libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--0.95%-- 0x208eb1000000000\n\t |\n\t |--0.63%-- htab_traverse_noresize\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 5.07% sh libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.99% python-config libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.54% make libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--7.34%-- glob\n\t | |\n\t | |--93.18%-- 0x41588f\n\t | |\n\t | --6.82%-- glob\n\t | 0x41588f\n\n\t ...\n\n Or:\n\n\t$ perf report -g flat | less\n\n\t# Overhead Command Shared Object Symbol\n\t# ........ ............. ............. ..........\n\t#\n\t 32.03% git libc-2.15.so [.] malloc\n\t 27.19%\n\t malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t 24.77%\n\t malloc\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t 11.02%\n\t malloc\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t 6.57%\n\t malloc\n\n\t ...\n\n The core uprobes design is fairly straightforward: uprobes probe\n points register themselves at (inode:offset) addresses of\n libraries/binaries, after which all existing (or new) vmas that map\n that address will have a software breakpoint injected at that address.\n vmas are COW-ed to preserve original content. The probe points are\n kept in an rbtree.\n\n If user-space executes the probed inode:offset instruction address\n then an event is generated which can be recovered from the regular\n perf event channels and mmap-ed ring-buffer.\n\n Multiple probes at the same address are supported, they create a\n dynamic callback list of event consumers.\n\n The basic model is further complicated by the XOL speedup: the\n original instruction that is probed is copied (in an architecture\n specific fashion) and executed out of line when the probe triggers.\n The XOL area is a single vma per process, with a fixed number of\n entries (which limits probe execution parallelism).\n\n The API: uprobes are installed/removed via\n /sys/kernel/debug/tracing/uprobe_events, the API is integrated to\n align with the kprobes interface as much as possible, but is separate\n to it.\n\n Injecting a probe point is privileged operation, which can be relaxed\n by setting perf_paranoid to -1.\n\n You can use multiple probes as well and mix them with kprobes and\n regular PMU events or tracepoints, when instrumenting a task.\"\n\nFix up trivial conflicts in mm/memory.c due to previous cleanup of\nunmap_single_vma().\n\n* \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)\n perf probe: Detect probe target when m/x options are absent\n perf probe: Provide perf interface for uprobes\n tracing: Fix kconfig warning due to a typo\n tracing: Provide trace events interface for uprobes\n tracing: Extract out common code for kprobes/uprobes trace events\n tracing: Modify is_delete, is_return from int to bool\n uprobes/core: Decrement uprobe count before the pages are unmapped\n uprobes/core: Make background page replacement logic account for rss_stat counters\n uprobes/core: Optimize probe hits with the help of a counter\n uprobes/core: Allocate XOL slots for uprobes use\n uprobes/core: Handle breakpoint and singlestep exceptions\n uprobes/core: Rename bkpt to swbp\n uprobes/core: Make order of function parameters consistent across functions\n uprobes/core: Make macro names consistent\n uprobes: Update copyright notices\n uprobes/core: Move insn to arch specific structure\n uprobes/core: Remove uprobe_opcode_sz\n uprobes/core: Make instruction tables volatile\n uprobes: Move to kernel/events/\n uprobes/core: Clean up, refactor and improve the code\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": "31fe62b9586643953f0c0c37a6357dafc69034e2", "tree": "69f9990423969df4ecbaea9d1e8de748284bea5e", "parents": [ "d0a24a3516fb36023bef28d2355fa34e7f32029f" ], "author": { "name": "Tim Bird", "email": "tim.bird@am.sony.com", "time": "Wed May 23 13:33:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 24 00:28:21 2012 -0400" }, "message": "mm: add a low limit to alloc_large_system_hash\n\nUDP stack needs a minimum hash size value for proper operation and also\nuses alloc_large_system_hash() for proper NUMA distribution of its hash\ntables and automatic sizing depending on available system memory.\n\nOn some low memory situations, udp_table_init() must ignore the\nalloc_large_system_hash() result and reallocs a bigger memory area.\n\nAs we cannot easily free old hash table, we leak it and kmemleak can\nissue a warning.\n\nThis patch adds a low limit parameter to alloc_large_system_hash() to\nsolve this problem.\n\nWe then specify UDP_HTABLE_SIZE_MIN for UDP/UDPLite hash table\nallocation.\n\nReported-by: Mark Asselstine \u003cmark.asselstine@windriver.com\u003e\nReported-by: Tim Bird \u003ctim.bird@am.sony.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9369910a6225b8d4892c3f20ae740a711cd5ace", "tree": "8650ff79d7607bceb35509c028400ecf1c317de0", "parents": [ "05f144a0d5c2207a0349348127f996e104ad7404", "415d04d08fec74b226c92c1fb54ad117c9c6bac4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 18:11:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 18:11:45 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull first series of signal handling cleanups from Al Viro:\n \"This is just the first part of the queue (about a half of it);\n assorted fixes all over the place in signal handling.\n\n This one ends with all sigsuspend() implementations switched to\n generic one (-\u003esaved_sigmask-based).\n\n With this, a bunch of assorted old buglets are fixed and most of the\n missing bits of NOTIFY_RESUME hookup are in place. Two more fixes sit\n in arm and um trees respectively, and there\u0027s a couple of broken ones\n that need obvious fixes - parisc and avr32 check TIF_NOTIFY_RESUME\n only on one of two codepaths; fixes for that will happen in the next\n series\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (55 commits)\n unicore32: if there\u0027s no handler we need to restore sigmask, syscall or no syscall\n xtensa: add handling of TIF_NOTIFY_RESUME\n microblaze: drop \u0027oldset\u0027 argument of do_notify_resume()\n microblaze: handle TIF_NOTIFY_RESUME\n score: add handling of NOTIFY_RESUME to do_notify_resume()\n m68k: add TIF_NOTIFY_RESUME and handle it.\n sparc: kill ancient comment in sparc_sigaction()\n h8300: missing checks of __get_user()/__put_user() return values\n frv: missing checks of __get_user()/__put_user() return values\n cris: missing checks of __get_user()/__put_user() return values\n powerpc: missing checks of __get_user()/__put_user() return values\n sh: missing checks of __get_user()/__put_user() return values\n sparc: missing checks of __get_user()/__put_user() return values\n avr32: struct old_sigaction is never used\n m32r: struct old_sigaction is never used\n xtensa: xtensa_sigaction doesn\u0027t exist\n alpha: tidy signal delivery up\n score: don\u0027t open-code force_sigsegv()\n cris: don\u0027t open-code force_sigsegv()\n blackfin: don\u0027t open-code force_sigsegv()\n ...\n" }, { "commit": "644473e9c60c1ff4f6351fed637a6e5551e3dce7", "tree": "10316518bedc735a2c6552886658d69dfd9f1eb0", "parents": [ "fb827ec68446c83e9e8754fa9b55aed27ecc4661", "4b06a81f1daee668fbd6de85557bfb36dd36078f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:42:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:42:39 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace enhancements from Eric Biederman:\n \"This is a course correction for the user namespace, so that we can\n reach an inexpensive, maintainable, and reasonably complete\n implementation.\n\n Highlights:\n - Config guards make it impossible to enable the user namespace and\n code that has not been converted to be user namespace safe.\n\n - Use of the new kuid_t type ensures the if you somehow get past the\n config guards the kernel will encounter type errors if you enable\n user namespaces and attempt to compile in code whose permission\n checks have not been updated to be user namespace safe.\n\n - All uids from child user namespaces are mapped into the initial\n user namespace before they are processed. Removing the need to add\n an additional check to see if the user namespace of the compared\n uids remains the same.\n\n - With the user namespaces compiled out the performance is as good or\n better than it is today.\n\n - For most operations absolutely nothing changes performance or\n operationally with the user namespace enabled.\n\n - The worst case performance I could come up with was timing 1\n billion cache cold stat operations with the user namespace code\n enabled. This went from 156s to 164s on my laptop (or 156ns to\n 164ns per stat operation).\n\n - (uid_t)-1 and (gid_t)-1 are reserved as an internal error value.\n Most uid/gid setting system calls treat these value specially\n anyway so attempting to use -1 as a uid would likely cause\n entertaining failures in userspace.\n\n - If setuid is called with a uid that can not be mapped setuid fails.\n I have looked at sendmail, login, ssh and every other program I\n could think of that would call setuid and they all check for and\n handle the case where setuid fails.\n\n - If stat or a similar system call is called from a context in which\n we can not map a uid we lie and return overflowuid. The LFS\n experience suggests not lying and returning an error code might be\n better, but the historical precedent with uids is different and I\n can not think of anything that would break by lying about a uid we\n can\u0027t map.\n\n - Capabilities are localized to the current user namespace making it\n safe to give the initial user in a user namespace all capabilities.\n\n My git tree covers all of the modifications needed to convert the core\n kernel and enough changes to make a system bootable to runlevel 1.\"\n\nFix up trivial conflicts due to nearby independent changes in fs/stat.c\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (46 commits)\n userns: Silence silly gcc warning.\n cred: use correct cred accessor with regards to rcu read lock\n userns: Convert the move_pages, and migrate_pages permission checks to use uid_eq\n userns: Convert cgroup permission checks to use uid_eq\n userns: Convert tmpfs to use kuid and kgid where appropriate\n userns: Convert sysfs to use kgid/kuid where appropriate\n userns: Convert sysctl permission checks to use kuid and kgids.\n userns: Convert proc to use kuid/kgid where appropriate\n userns: Convert ext4 to user kuid/kgid where appropriate\n userns: Convert ext3 to use kuid/kgid where appropriate\n userns: Convert ext2 to use kuid/kgid where appropriate.\n userns: Convert devpts to use kuid/kgid where appropriate\n userns: Convert binary formats to use kuid/kgid where appropriate\n userns: Add negative depends on entries to avoid building code that is userns unsafe\n userns: signal remove unnecessary map_cred_ns\n userns: Teach inode_capable to understand inodes whose uids map to other namespaces.\n userns: Fail exec for suid and sgid binaries with ids outside our user namespace.\n userns: Convert stat to return values mapped from kuids and kgids\n userns: Convert user specfied uids and gids in chown into kuids and kgid\n userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs\n ...\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": "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": "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": "56edab315927d2a5ae6064b9fc083236a6fc278f", "tree": "1b00b00033d769d6039448b6d8feffcf86b06088", "parents": [ "3813d4024a75562baf77d3907fb6afbf8f9c8232", "5bcdf5e4fee3c45e1281c25e4941f2163cb28c65", "ab0cce560ef177bdc7a8f73e9962be9d829a7b2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 12:12:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 12:12:49 2012 -0700" }, "message": "Merge branches \u0027perf-urgent-for-linus\u0027 and \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n\n - Leftover AMD PMU driver fix fix from the end of the v3.4\n stabilization cycle.\n\n - Late tools/perf/ changes that missed the first round:\n * endianness fixes\n * event parsing improvements\n * libtraceevent fixes factored out from trace-cmd\n * perl scripting engine fixes related to libtraceevent,\n * testcase improvements\n * perf inject / pipe mode fixes\n * plus a kernel side fix\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf/x86: Update event scheduling constraints for AMD family 15h models\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n Revert \"sched, perf: Use a single callback into the scheduler\"\n perf evlist: Show event attribute details\n perf tools: Bump default sample freq to 4 kHz\n perf buildid-list: Work better with pipe mode\n perf tools: Fix piped mode read code\n perf inject: Fix broken perf inject -b\n perf tools: rename HEADER_TRACE_INFO to HEADER_TRACING_DATA\n perf tools: Add union u64_swap type for swapping u64 data\n perf tools: Carry perf_event_attr bitfield throught different endians\n perf record: Fix documentation for branch stack sampling\n perf target: Add cpu flag to sample_type if target has cpu\n perf tools: Always try to build libtraceevent\n perf tools: Rename libparsevent to libtraceevent in Makefile\n perf script: Rename struct event to struct event_format in perl engine\n perf script: Explicitly handle known default print arg type\n perf tools: Add hardcoded name term for pmu events\n perf tools: Separate \u0027mem:\u0027 event scanner bits\n perf tools: Use allocated list for each parsed event\n perf tools: Add support for displaying event parser debug info\n perf test: Move parse event automated tests to separated object\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": "d0a24a3516fb36023bef28d2355fa34e7f32029f", "tree": "effd93d9af8c9f7876998d17f52a23f01091d76c", "parents": [ "37c106d0a444bcb48648ed1366890333972e5990" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed May 23 04:43:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 23 13:49:23 2012 -0400" }, "message": "ipx: restore token ring define to include/linux/ipx.h\n\nCommit 211ed865108e24697b44bee5daac502ee6bdd4a4\n\n \"net: delete all instances of special processing for token ring\"\n\nremoved the define for IPX_FRAME_TR_8022.\n\nWhile it is unlikely, we can\u0027t be 100% sure that there aren\u0027t\nrandom userspace consumers of this value, so restore it.\n\nThe only instance I could find was in ncpfs-2.2.6, and it was\nsafe as-is, since it used #ifdef IPX_FRAME_TR_8022 around the\ntwo use cases it had, but there may be other userspace packages\nwithout similar ifdefs.\n\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a8580f82024e30b31c662aa49346adf7a3bcdb5", "tree": "7769a01f152b4081f4e4225e499082fd5c67b184", "parents": [ "1d767cae4dbd4116fc3b2cc3251a20760f98339f", "2ccf62b36097aa88e0ea152d6ef0c0ca2d3884e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:01:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:01:41 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml\n\nPull UML updates from Richard Weinberger:\n \"Most changes are bug fixes and cleanups\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:\n um: missing checks of __put_user()/__get_user() return values\n um: stub_rt_sigsuspend isn\u0027t needed these days anymore\n um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h\n irq: Remove irq_chip-\u003erelease()\n um: Remove CONFIG_IRQ_RELEASE_METHOD\n um: Remove usage of irq_chip-\u003erelease()\n um: Implement um_free_irq()\n um: Fix __swp_type()\n um: Implement a custom pte_same() function\n um: Add BUG() to do_ops()\u0027s error path\n um: Remove unused variables\n um: bury unused _TIF_RESTORE_SIGMASK\n um: wrong sigmask saved in case of multiple sigframes\n um: add TIF_NOTIFY_RESUME\n um: -\u003erestart_block.fn needs to be reset on sigreturn\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": "ab0cce560ef177bdc7a8f73e9962be9d829a7b2c", "tree": "d9875b21c42862201624eb7d9ea2c36f4ea4035d", "parents": [ "26252ea675663d1bc6747125fcaa2b7cc4ed8a03" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Wed May 23 13:13:02 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Wed May 23 17:40:51 2012 +0200" }, "message": "Revert \"sched, perf: Use a single callback into the scheduler\"\n\nThis reverts commit cb04ff9ac424 (\"sched, perf: Use a single\ncallback into the scheduler\").\n\nBefore this change was introduced, the process switch worked\nlike this (wrt. to perf event schedule):\n\n schedule (prev, next)\n - schedule out all perf events for prev\n - switch to next\n - schedule in all perf events for current (next)\n\nAfter the commit, the process switch looks like:\n\n schedule (prev, next)\n - schedule out all perf events for prev\n - schedule in all perf events for (next)\n - switch to next\n\nThe problem is, that after we schedule perf events in, the pmu\nis enabled and we can receive events even before we make the\nswitch to next - so \"current\" still being prev process (event\nSAMPLE data are filled based on the value of the \"current\"\nprocess).\n\nThats exactly what we see for test__PERF_RECORD test. We receive\nSAMPLES with PID of the process that our tracee is scheduled\nfrom.\n\nDiscussed with Peter Zijlstra:\n\n \u003e Bah!, yeah I guess reverting is the right thing for now. Sad\n \u003e though.\n \u003e\n \u003e So by having the two hooks we have a black-spot between them\n \u003e where we receive no events at all, this black-spot covers the\n \u003e hand-over of current and we thus don\u0027t receive the \u0027wrong\u0027\n \u003e events.\n \u003e\n \u003e I rather liked we could do away with both that black-spot and\n \u003e clean up the code a little, but apparently people rely on it.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: acme@redhat.com\nCc: paulus@samba.org\nCc: cjashfor@linux.vnet.ibm.com\nCc: fweisbec@gmail.com\nCc: eranian@google.com\nLink: http://lkml.kernel.org/r/20120523111302.GC1638@m.brq.redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "129b78bfca591e736e56a294f0e357d73d938f7e", "tree": "b5754d4b12346b67077ac3b2239c04bda37bf6a0", "parents": [ "96503f592fd729f296f5870a57be0417eeffc92a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:46:06 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 23 10:46:27 2012 +0100" }, "message": "ttm: add prime sharing support to TTM (v2)\n\nThis adds the ability for ttm common code to take an SG table\nand use it as the backing for a slave TTM object.\n\nThe drivers can then populate their GTT tables using the SG object.\n\nv2: make sure to setup VM for sg bos as well.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "51ab7ba2673758561074184795bba5bac780a038", "tree": "698c399d22524b5ec018af82c89d6c5c8ff422a3", "parents": [ "4d93914ae3db4a897ead4b1e33eca7cdfff4c6f7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 18 15:40:33 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 23 10:45:57 2012 +0100" }, "message": "drm/prime: introduce sg-\u003epages/addr arrays helper\n\nthe ttm drivers need this currently, in order to get fault handling\nworking and efficient.\n\nIt also allows addrs to be NULL for devices like udl.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6101167727932a929e37fb8a6eeb68bdbf54d58e", "tree": "da3e9c8244f86082c6ea4d150f7fa653a7843192", "parents": [ "6133308ad1a386e7e7f776003a1c44e8b54e2166", "75af271ed5f51b1f3506c7c1d567b1f32e5c9206" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:31:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:31:38 2012 -0700" }, "message": "Merge tag \u0027dlm-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm\n\nPull dlm updates from David Teigland:\n \"This set includes some minor fixes and improvements. The one large\n patch addresses the special \"nodir\" mode, which has been a long\n neglected proof of concept, but with these fixes seems to be quite\n usable. It allows the resource master to be assigned statically\n instead of dynamically, which can improve performance if there is\n little locality and most resources are shared.\"\n\n* tag \u0027dlm-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:\n dlm: NULL dereference on failure in kmem_cache_create()\n gfs2: fix recovery during unmount\n dlm: fixes for nodir mode\n dlm: improve error and debug messages\n dlm: avoid unnecessary search in search_rsb\n dlm: limit rcom debug messages\n dlm: fix waiter recovery\n dlm: prevent connections during shutdown\n" }, { "commit": "6133308ad1a386e7e7f776003a1c44e8b54e2166", "tree": "b2102f3bd3b25e0f105cd91b6a22bd96a351c5d7", "parents": [ "e8650a08232e75274304b812ff04cfce9af9671c", "62f384552b6756cf1ea71f8762d1e97dc77dbd90" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:30:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:30:27 2012 -0700" }, "message": "Merge tag \u0027upstream-3.5-rc1\u0027 of git://git.infradead.org/linux-ubifs\n\nPull UBI and UBIFS updates from Artem Bityutskiy:\n\nUBIFS:\n * Always support xattrs (remove the Kconfig option)\n * Always support debugging (remove the Kconfig option)\n * A fix for a memory leak on error path\n * A number of clean-ups\nUBI:\n * Always support debugging (remove the Kconfig option)\n * Remove \"data type\" hint support\n * Huge amount of renames to prepare for the fastmap wor\n * A lot of clean-ups\n\n* tag \u0027upstream-3.5-rc1\u0027 of git://git.infradead.org/linux-ubifs: (54 commits)\n UBI: modify ubi_wl_flush function to clear work queue for a lnum\n UBI: introduce UBI_ALL constant\n UBI: add lnum and vol_id to struct ubi_work\n UBI: add volume id struct ubi_ainf_peb\n UBI: add in hex the value for UBI_INTERNAL_VOL_START to comment\n UBI: rename scan.c to attach.c\n UBI: remove scan.h\n UBI: rename UBI_SCAN_UNKNOWN_EC\n UBI: move and rename attach_by_scanning\n UBI: rename _init_scan functions\n UBI: amend comments after all the renamings\n UBI: rename ubi_scan_leb_slab\n UBI: rename ubi_scan_move_to_list\n UBI: rename ubi_scan_destroy_ai\n UBI: rename ubi_scan_get_free_peb\n UBI: rename ubi_scan_rm_volume\n UBI: rename ubi_scan_find_av\n UBI: rename ubi_scan_add_used\n UBI: remove unused function\n UBI: make ubi_scan_erase_peb static and rename\n ...\n" }, { "commit": "e8650a08232e75274304b812ff04cfce9af9671c", "tree": "0609c942e6ca99016e788ff2ee2bbed1bb9215a4", "parents": [ "3c2c4b73aa79e4a1b601710b59e092441175f4bb", "f70d4a95edc7da87f39cd8b603ba131df2c198ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial updates from Jiri Kosina:\n \"As usual, it\u0027s mostly typo fixes, redundant code elimination and some\n documentation updates.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)\n edac, mips: don\u0027t change code that has been removed in edac/mips tree\n xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer\n lib: Change mail address of Oskar Schirmer\n net: Change mail address of Oskar Schirmer\n arm/m68k: Change mail address of Sebastian Hess\n i2c: Change mail address of Oskar Schirmer\n net: Fix tcp_build_and_update_options comment in struct tcp_sock\n atomic64_32.h: fix parameter naming mismatch\n Kconfig: replace \"--- help ---\" with \"---help---\"\n c2port: fix bogus Kconfig \"default no\"\n edac: Fix spelling errors.\n qla1280: Remove redundant NULL check before release_firmware() call\n remoteproc: remove redundant NULL check before release_firmware()\n qla2xxx: Remove redundant NULL check before release_firmware() call.\n aic94xx: Get rid of redundant NULL check before release_firmware() call\n tehuti: delete redundant NULL check before release_firmware()\n qlogic: get rid of a redundant test for NULL before call to release_firmware()\n bna: remove redundant NULL test before release_firmware()\n tg3: remove redundant NULL test before release_firmware() call\n typhoon: get rid of redundant conditional before all to release_firmware()\n ...\n" }, { "commit": "3c2c4b73aa79e4a1b601710b59e092441175f4bb", "tree": "fbd08c3e18517871b25fe9c886caae423947d578", "parents": [ "f08b9c2f8af0d61faa1170aeae4fbca1eff6a504", "99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:21:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:21:48 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID subsystem updates from Jiri Kosina:\n \"Apart from various driver updates and added support for a number of\n new devices (mostly multitouch ones, but not limited to), there is one\n change that is worth pointing out explicitly: creation of HID device\n groups and proper autoloading of hid-multitouch, implemented by Henrik\n Rydberg.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (50 commits)\n HID: wacom: fix build breakage without CONFIG_LEDS_CLASS\n HID: waltop: Extend barrel button fix\n HID: hyperv: Set the hid drvdata correctly\n HID: wacom: Unify speed setting\n HID: wacom: Add speed setting for Intuos4 WL\n HID: wacom: Move Graphire raport header check.\n HID: uclogic: Add support for UC-Logic TWHL850\n HID: explain the signed/unsigned handling in hid_add_field()\n HID: handle logical min/max signedness properly in parser\n HID: logitech: read all 32 bits of report type bitfield\n HID: wacom: Add LED selector control for Wacom Intuos4 WL\n HID: hid-multitouch: fix wrong protocol detection\n HID: wiimote: Fix IR data parser\n HID: wacom: Add tilt reporting for Intuos4 WL\n HID: multitouch: MT interface matching for Baanto\n HID: hid-multitouch: Only match MT interfaces\n HID: Create a common generic driver\n HID: hid-multitouch: Switch to device groups\n HID: Create a generic device group\n HID: Allow bus wildcard matching\n ...\n" }, { "commit": "d79ee93de909dfb252279b9a95978bbda9a814a9", "tree": "bfccca60fd36259ff4bcc5e78a2c272fbd680065", "parents": [ "2ff2b289a695807e291e1ed9f639d8a3ba5f4254", "1c2927f18576d65631d8e0ddd19e1d023183222e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:27:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:27:32 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes from Ingo Molnar:\n \"The biggest change is the cleanup/simplification of the load-balancer:\n instead of the current practice of architectures twiddling scheduler\n internal data structures and providing the scheduler domains in\n colorfully inconsistent ways, we now have generic scheduler code in\n kernel/sched/core.c:sched_init_numa() that looks at the architecture\u0027s\n node_distance() parameters and (while not fully trusting it) deducts a\n NUMA topology from it.\n\n This inevitably changes balancing behavior - hopefully for the better.\n\n There are various smaller optimizations, cleanups and fixlets as well\"\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched: Taint kernel with TAINT_WARN after sleep-in-atomic bug\n sched: Remove stale power aware scheduling remnants and dysfunctional knobs\n sched/debug: Fix printing large integers on 32-bit platforms\n sched/fair: Improve the -\u003egroup_imb logic\n sched/nohz: Fix rq-\u003ecpu_load[] calculations\n sched/numa: Don\u0027t scale the imbalance\n sched/fair: Revert sched-domain iteration breakage\n sched/x86: Rewrite set_cpu_sibling_map()\n sched/numa: Fix the new NUMA topology bits\n sched/numa: Rewrite the CONFIG_NUMA sched domain support\n sched/fair: Propagate \u0027struct lb_env\u0027 usage into find_busiest_group\n sched/fair: Add some serialization to the sched_domain load-balance walk\n sched/fair: Let minimally loaded cpu balance the group\n sched: Change rq-\u003enr_running to unsigned int\n x86/numa: Check for nonsensical topologies on real hw as well\n x86/numa: Hard partition cpu topology masks on node boundaries\n x86/numa: Allow specifying node_distance() for numa\u003dfake\n x86/sched: Make mwait_usable() heed to \"idle\u003d\" kernel parameters properly\n sched: Update documentation and comments\n sched_rt: Avoid unnecessary dequeue and enqueue of pushable tasks in set_cpus_allowed_rt()\n" }, { "commit": "2ff2b289a695807e291e1ed9f639d8a3ba5f4254", "tree": "e4b7f44e5cc1582ba2be8aeba221f4841f4c86a6", "parents": [ "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "73787190d04a34e6da745da893b3ae8bedde418f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf changes from Ingo Molnar:\n \"Lots of changes:\n\n - (much) improved assembly annotation support in perf report, with\n jump visualization, searching, navigation, visual output\n improvements and more.\n\n - kernel support for AMD IBS PMU hardware features. Notably \u0027perf\n record -e cycles:p\u0027 and \u0027perf top -e cycles:p\u0027 should work without\n skid now, like PEBS does on the Intel side, because it takes\n advantage of IBS transparently.\n\n - the libtracevents library: it is the first step towards unifying\n tracing tooling and perf, and it also gives a tracing library for\n external tools like powertop to rely on.\n\n - infrastructure: various improvements and refactoring of the UI\n modules and related code\n\n - infrastructure: cleanup and simplification of the profiling\n targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.)\n\n - tons of robustness fixes all around\n\n - various ftrace updates: speedups, cleanups, robustness\n improvements.\n\n - typing \u0027make\u0027 in tools/ will now give you a menu of projects to\n build and a short help text to explain what each does.\n\n - ... and lots of other changes I forgot to list.\n\n The perf record make bzImage + perf report regression you reported\n should be fixed.\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (166 commits)\n tracing: Remove kernel_lock annotations\n tracing: Fix initial buffer_size_kb state\n ring-buffer: Merge separate resize loops\n perf evsel: Create events initially disabled -- again\n perf tools: Split term type into value type and term type\n perf hists: Fix callchain ip printf format\n perf target: Add uses_mmap field\n ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER\n ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()\n ftrace: Make ftrace_modify_all_code() global for archs to use\n ftrace: Return record ip addr for ftrace_location()\n ftrace: Consolidate ftrace_location() and ftrace_text_reserved()\n ftrace: Speed up search by skipping pages by address\n ftrace: Remove extra helper functions\n ftrace: Sort all function addresses, not just per page\n tracing: change CPU ring buffer state from tracing_cpumask\n tracing: Check return value of tracing_dentry_percpu()\n ring-buffer: Reset head page before running self test\n ring-buffer: Add integrity check at end of iter read\n ring-buffer: Make addition of pages in ring buffer atomic\n ...\n" }, { "commit": "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "tree": "8f17415c0722b0a4d7511ac170cfb4e3802e1ad2", "parents": [ "f5c101892fbd3d2f6d2729bc7eb7b3f6c31dbddd", "0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:40:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:40:19 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n \"cgroup file type addition / removal is updated so that file types are\n added and removed instead of individual files so that dynamic file\n type addition / removal can be implemented by cgroup and used by\n controllers. blkio controller changes which will come through block\n tree are dependent on this. Other changes include res_counter cleanup\n and disallowing kthread / PF_THREAD_BOUND threads to be attached to\n non-root cgroups.\n\n There\u0027s a reported bug with the file type addition / removal handling\n which can lead to oops on cgroup umount. The issue is being looked\n into. It shouldn\u0027t cause problems for most setups and isn\u0027t a\n security concern.\"\n\nFix up trivial conflict in Documentation/feature-removal-schedule.txt\n\n* \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n res_counter: Account max_usage when calling res_counter_charge_nofail()\n res_counter: Merge res_counter_charge and res_counter_charge_nofail\n cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads\n cgroup: remove cgroup_subsys-\u003epopulate()\n cgroup: get rid of populate for memcg\n cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg\n cgroup: make css-\u003erefcnt clearing on cgroup removal optional\n cgroup: use negative bias on css-\u003erefcnt to block css_tryget()\n cgroup: implement cgroup_rm_cftypes()\n cgroup: introduce struct cfent\n cgroup: relocate __d_cgrp() and __d_cft()\n cgroup: remove cgroup_add_file[s]()\n cgroup: convert memcg controller to the new cftype interface\n memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP\n cgroup: convert all non-memcg controllers to the new cftype interface\n cgroup: relocate cftype and cgroup_subsys definitions in controllers\n cgroup: merge cft_release_agent cftype array into the base files array\n cgroup: implement cgroup_add_cftypes() and friends\n cgroup: build list of all cgroups under a given cgroupfs_root\n cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()\n ...\n" }, { "commit": "f5c101892fbd3d2f6d2729bc7eb7b3f6c31dbddd", "tree": "ae24f42e327c95af356cfa5ba407b1a7fad84fd5", "parents": [ "c54894cd4672d513e43e0d17d7b0387bf6b2c2c4", "641b695c2f11397bd307ea689d4d3f128360ce49" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:37:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:37:47 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\nPull percpu updates from Tejun Heo:\n \"Contains Alex Shi\u0027s three patches to remove percpu_xxx() which overlap\n with this_cpu_xxx(). There shouldn\u0027t be any functional change.\"\n\n* \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: remove percpu_xxx() functions\n x86: replace percpu_xxx funcs with this_cpu_xxx\n net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx\n" }, { "commit": "c54894cd4672d513e43e0d17d7b0387bf6b2c2c4", "tree": "85a540716d82570f98a92b85c66ea5875f983f46", "parents": [ "fb09bafda67041b74a668dc9d77735e36bd33d3b", "4d82a1debbffec129cc387aafa8f40b7bbab3297" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:36:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:36:56 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue changes from Tejun Heo:\n \"Nothing exciting. Most are updates to debug stuff and related fixes.\n Two not-too-critical bugs are fixed - WARN_ON() triggering spurious\n during cpu offlining and unlikely lockdep related oops.\"\n\n* \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n lockdep: fix oops in processing workqueue\n workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active\n workqueue: Catch more locking problems with flush_work()\n workqueue: change BUG_ON() to WARN_ON()\n trace: Remove unused workqueue tracer\n" }, { "commit": "fb09bafda67041b74a668dc9d77735e36bd33d3b", "tree": "2dd32b65062a95045468fdcab366ecdb8e4fcac6", "parents": [ "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "c3c6cc91b0ae7b3d598488ad0b593bafba4a0817" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "message": "Merge tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree changes from Greg Kroah-Hartman:\n \"Here is the big staging tree pull request for the 3.5-rc1 merge\n window.\n\n Loads of changes here, and we just narrowly added more lines than we\n added:\n 622 files changed, 28356 insertions(+), 26059 deletions(-)\n\n But, good news is that there is a number of subsystems that moved out\n of the staging tree, to their respective \"real\" portions of the\n kernel.\n\n Code that moved out was:\n\t- iio core code\n\t- mei driver\n\t- vme core and bridge drivers\n\n There was one broken network driver that moved into staging as a step\n before it is removed from the tree (pc300), and there was a few new\n drivers added to the tree:\n\t- new iio drivers\n\t- gdm72xx wimax USB driver\n\t- ipack subsystem and 2 drivers\n\n All of the movements around have acks from the various subsystem\n maintainers, and all of this has been in the linux-next tree for a\n while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFixed up various trivial conflicts, along with a non-trivial one found\nin -next and pointed out by Olof Johanssen: a clean - but incorrect -\nmerge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually\nas per Stephen Rothwell.\n\n* tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)\n Staging: bcm: Remove two unused variables from Adapter.h\n Staging: bcm: Removes the volatile type definition from Adapter.h\n Staging: bcm: Rename all \"INT\" to \"int\" in Adapter.h\n Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h\n Staging: bcm: Correctly format all comments in Adapter.h\n Staging: bcm: Fix all whitespace issues in Adapter.h\n Staging: bcm: Properly format braces in Adapter.h\n Staging: ipack/bridges/tpci200: remove unneeded casts\n Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant\n Staging: ipack: remove board_name and bus_name fields from struct ipack_device\n Staging: ipack: improve the register of a bus and a device in the bus.\n staging: comedi: cleanup all the comedi_driver \u0027detach\u0027 functions\n staging: comedi: remove all \u0027default N\u0027 in Kconfig\n staging: line6/config.h: Delete unused header\n staging: gdm72xx depends on NET\n staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices\n staging: drm/omap: initial dmabuf/prime import support\n staging: drm/omap: dmabuf/prime mmap support\n pstore/ram: Add ECC support\n pstore/ram: Switch to persistent_ram routines\n ...\n" }, { "commit": "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "tree": "39197121b6ef8cddaa0f4057fe24b4ced58e8982", "parents": [ "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "59bd234b72fc29887839d792b7d6c7e8d2a577a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "message": "Merge tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY updates from Greg Kroah-Hartman:\n \"Here\u0027s the big TTY/serial driver pull request for the 3.5-rc1 merge\n window.\n\n Nothing major in here, just lots of incremental changes from Alan and\n Jiri reworking some tty core things to behave better and to get a more\n solid grasp on some of the nasty tty locking issues.\n\n There are a few tty and serial driver updates in here as well.\n\n All of this has been in the linux-next releases for a while with no\n problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (115 commits)\n serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.\n serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.\n serial: bfin_uart: narrow the reboot condition in DMA tx interrupt\n serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.\n Revert \"serial_core: Update buffer overrun statistics.\"\n tty: hvc_xen: NULL dereference on allocation failure\n tty: Fix LED error return\n tty: Allow uart_register/unregister/register\n tty: move global ldisc idle waitqueue to the individual ldisc\n serial8250-em: Add DT support\n serial8250-em: clk_get() IS_ERR() error handling fix\n serial_core: Update buffer overrun statistics.\n tty: drop the pty lock during hangup\n cris: fix missing tty arg in wait_event_interruptible_tty call\n tty/amiserial: Add missing argument for tty_unlock()\n tty_lock: Localise the lock\n pty: Lock the devpts bits privately\n tty_lock: undo the old tty_lock use on the ctty\n serial8250-em: Emma Mobile UART driver V2\n Add missing call to uart_update_timeout()\n ...\n" }, { "commit": "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "tree": "1c419660defa56191091dfdf50fdb57a72009173", "parents": [ "fb2123fad3b499f0898835b19dbb93b18d27ee98", "94ca629e40eb7e997be21d8065c25e4f3797b03f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:02:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:02:13 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core updates from Greg Kroah-Hartman:\n \"Here\u0027s the driver core, and other driver subsystems, pull request for\n the 3.5-rc1 merge window.\n\n Outside of a few minor driver core changes, we ended up with the\n following different subsystem and core changes as well, due to\n interdependancies on the driver core:\n - hyperv driver updates\n - drivers/memory being created and some drivers moved into it\n - extcon driver subsystem created out of the old Android staging\n switch driver code\n - dynamic debug updates\n - printk rework, and /dev/kmsg changes\n\n All of this has been tested in the linux-next releases for a few weeks\n with no reported problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up conflicts in drivers/extcon/extcon-max8997.c where git noticed\nthat a patch to the deleted drivers/misc/max8997-muic.c driver needs to\nbe applied to this one.\n\n* tag \u0027driver-core-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)\n uio_pdrv_genirq: get irq through platform resource if not set otherwise\n memory: tegra{20,30}-mc: Remove empty *_remove()\n printk() - isolate KERN_CONT users from ordinary complete lines\n sysfs: get rid of some lockdep false positives\n Drivers: hv: util: Properly handle version negotiations.\n Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()\n memory: tegra{20,30}-mc: Use dev_err_ratelimited()\n driver core: Add dev_*_ratelimited() family\n Driver Core: don\u0027t oops with unregistered driver in driver_find_device()\n printk() - restore prefix/timestamp printing for multi-newline strings\n printk: add stub for prepend_timestamp()\n ARM: tegra30: Make MC optional in Kconfig\n ARM: tegra20: Make MC optional in Kconfig\n ARM: tegra30: MC: Remove unnecessary BUG*()\n ARM: tegra20: MC: Remove unnecessary BUG*()\n printk: correctly align __log_buf\n ARM: tegra30: Add Tegra Memory Controller(MC) driver\n ARM: tegra20: Add Tegra Memory Controller(MC) driver\n printk() - restore timestamp printing at console output\n printk() - do not merge continuation lines of different threads\n ...\n" }, { "commit": "fb2123fad3b499f0898835b19dbb93b18d27ee98", "tree": "7273754cded304f52dbbef86d23dda96e0a8452a", "parents": [ "a481991467d38afb43c3921d5b5b59ccb61b04ba", "991214386dee8a3cd9adc743778f472ac8a12bbc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull Char/Misc patches from Greg Kroah-Hartman:\n \"Here are a few various char/misc tree patches for the 3.5-rc1 merge\n window.\n\n Nothing major here at all, just different driver updates and some\n parport dead code removal.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n parport: remove unused dead code from lowlevel drivers\n xilinx_hwicap: reset XHI_MAX_RETRIES\n xilinx_hwicap: add support for virtex6 FPGAs\n Support M95040 SPI EEPROM\n misc: add support for bmp18x chips to the bmp085 driver\n misc: bmp085: add device tree properties\n misc: clean up bmp085 driver\n misc: do not mark exported functions __devexit\n misc: add missing __devexit_p() annotations\n pch_phub: delete duplicate definitions\n misc: Fix irq leak in max8997_muic_probe error path\n" }, { "commit": "a481991467d38afb43c3921d5b5b59ccb61b04ba", "tree": "a4b0b9a14da6fd5ef7b9b512bb32dbfcfcf2cd71", "parents": [ "f6a26ae7699416d86bea8cb68ce413571e9cab3c", "cda4db53e9c28061c100400e1a4d273ea61dfba9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:50:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:50:46 2012 -0700" }, "message": "Merge tag \u0027usb-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB 3.5-rc1 changes from Greg Kroah-Hartman:\n \"Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.\n\n It\u0027s touches a lot of different parts of the kernel, all USB drivers,\n due to some API cleanups (getting rid of the ancient err() macro) and\n some changes that are needed for USB 3.0 power management updates.\n\n There are also lots of new drivers, pimarily gadget, but others as\n well. We deleted a staging driver, which was nice, and finally\n dropped the obsolete usbfs code, which will make Al happy to never\n have to touch that again.\n\n There were some build errors in the tree that linux-next found a few\n days ago, but those were fixed by the most recent changes (all were\n due to us not building with CONFIG_PM disabled.)\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)\n xhci: Fix DIV_ROUND_UP compile error.\n xhci: Fix compile with CONFIG_USB_SUSPEND\u003dn\n USB: Fix core compile with CONFIG_USB_SUSPEND\u003dn\n brcm80211: Fix compile error for .disable_hub_initiated_lpm.\n Revert \"USB: EHCI: work around bug in the Philips ISP1562 controller\"\n MAINTAINERS: Add myself as maintainer to the USB PHY Layer\n USB: EHCI: fix command register configuration lost problem\n USB: Remove races in devio.c\n USB: ehci-platform: remove update_device\n USB: Disable hub-initiated LPM for comms devices.\n xhci: Add Intel U1/U2 timeout policy.\n xhci: Add infrastructure for host-specific LPM policies.\n USB: Add macros for interrupt endpoint types.\n xhci: Reserve one command for USB3 LPM disable.\n xhci: Some Evaluate Context commands must succeed.\n USB: Disable USB 3.0 LPM in critical sections.\n USB: Add support to enable/disable USB3 link states.\n USB: Allow drivers to disable hub-initiated LPM.\n USB: Calculate USB 3.0 exit latencies for LPM.\n USB: Refactor code to set LPM support flag.\n ...\n\nConflicts:\n\tarch/arm/mach-exynos/mach-nuri.c\n\tarch/arm/mach-exynos/mach-universal_c210.c\n\tdrivers/net/wireless/ath/ath6kl/usb.c\n" }, { "commit": "37c106d0a444bcb48648ed1366890333972e5990", "tree": "a6c1abbfaa781c7d9453b9c298f13d9d0f9f580d", "parents": [ "76648102cfabc586ce1e9d0c4ebba2000e7b1ca0" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue May 22 11:01:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 22 17:13:11 2012 -0400" }, "message": "if: restore token ring ARP type to header\n\nRecent removal of Token Ring breaks the build of iproute2.\n\nEven though Token Ring support is gone from the kernel, it is worth\nkeeping the the definition of the TR ARP type to avoid breaking\nuserspace programs that use this file.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6a26ae7699416d86bea8cb68ce413571e9cab3c", "tree": "e91b7a7c7513151fe583721f7435cc9f5cdc4f42", "parents": [ "cdd3a354a05b0c33fe33ab11a0fb0838396cad19", "48a5765e5104f1afd22c75c5030af3a6cf24b4c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 13:32:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 13:32:53 2012 -0700" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc board specific changes from Olof Johansson:\n \"While we generally attempt to get rid of board specific files and\n replace them with device tree based descriptions, a lot of platforms\n have not come that far:\n\n In shmobile, we add two new board files because their recently started\n effort to add DT support has not proceeded enough to use it for all of\n the important hardware.\n\n In Kirkwood, we are adding support for new boards with a combination\n of DT and board file contents in multiple cases.\n\n pxa/mmp and imx are extending support for existing board files but not\n adding new ones.\"\n\nFix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: shmobile: fix smp build\n ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree\n kirkwood: Add iconnect support\n orion/kirkwood: create a generic function for gpio led blinking\n kirkwood/orion: fix orion_gpio_set_blink\n ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt\n kirkwood: Allow nand to be configured via. devicetree\n mtd: Add orion_nand devicetree bindings\n ARM: kirkwood: Basic support for DNS-320 and DNS-325\n ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva\n ARM: mach-shmobile: Use DT_MACHINE for KZM9G\n ARM: pxa: hx4700: Add Synaptics NavPoint touchpad\n ARM: pxa: Use REGULATOR_SUPPLY macro\n ARM: mach-shmobile: kzm9g: enable SMP boot\n ARM: mach-shmobile: kzm9g: defconfig update\n ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key\n ARM: mach-shmobile: kzm9g: add SDHI support\n ARM: mach-shmobile: kzm9g: add MMCIF support\n ARM: mach-shmobile: kzm9g: correct screen direction\n ARM: mach-shmobile: sh73a0.h: add GPIO_NR\n ...\n" }, { "commit": "c3719a1ef52eb1aadf77b7557cc9ca08124d8818", "tree": "9fc3737751948a71cde8f8ff64d1ca4cb0f44932", "parents": [ "35c579070a349cfe54f9e09a47df2c5b68d58469", "a0d0d1685f9763ab26a394df3ab84026b39a06a7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 22 16:07:23 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 22 16:07:23 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nJohn says:\n\n--------------------\nI apologize for not having sent this sooner. FWIW, I was in a car\nsomewhere between Illinois and North Carolina for most of the day\nSunday and Monday... :-)\n\nThis is (obviously) the last non-fix pull request for wireless bits\nintended for 3.5. It includes AP support for mwifiex, a variety of HCI\nand other updates for NFC, some brcmfmac and brcmsmac refactoring,\na large batch of ssb and bcma updates, a batch of ath6kl updates,\nsome cfg80211 and mac80211 updates/refactoring from Johannes Berg,\na rather large collection of Bluetooth updates by way of Gustavo,\nand a variety of other bits here and there.\n--------------------\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35c579070a349cfe54f9e09a47df2c5b68d58469", "tree": "57eb18bbc513a5568baa6859d5b71155a1c1b2b2", "parents": [ "2cfb311f9943551915c13a71ec480b33028d33c1" ], "author": { "name": "Nobuhiro Iwamatsu", "email": "nobuhiro.iwamatsu.yj@renesas.com", "time": "Mon May 21 14:20:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 22 15:20:28 2012 -0400" }, "message": "phy/micrel: Fix ID of KSZ9021\n\nRight ID of KSZ9021 is 0x00221610.\nBecause lower 4bit is a revision number, it varies according to a chip.\n\nSigned-off-by: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nCc: David J. Choi \u003cdavid.choi@micrel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a0d0d1685f9763ab26a394df3ab84026b39a06a7", "tree": "4165dc6fd3266977ab4b3fa3b379c47597f97d88", "parents": [ "31a67102f4762df5544bc2dfb34a931233d2a5b2", "05f8f25276ea8c7d41b3649890d6eaf179e67a81" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 22 15:18:06 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 22 15:18:06 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n" }, { "commit": "813a95e5b4fa936bbde10ef89188932745dcd7f4", "tree": "571ca345861ffb89b45fabe26fcab4e133c8537b", "parents": [ "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "f3f08dcb9965f42378851ce888fb7539607712e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "message": "Merge tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm soc-specific pinctrl changes from Olof Johansson:\n \"With this, five platforms are moving to the relatively new pinctrl\n subsystem for their pin management, replacing the older soc specific\n in-kernel interfaces with common code.\n\n There is quite a bit of net addition of code for each platform being\n added to the pinctrl subsystem. But the payback comes later when\n adding new boards can be done by only providing new device trees\n instead.\"\n\nFix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}\n\n* tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n mtd: nand: gpmi: fix compile error caused by pinctrl call\n ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n ARM: nomadik: enable PINCTRL_NOMADIK where needed\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n ARM: ux500: switch MSP to using pinctrl for pins\n ARM: ux500: alter MSP registration to return a device pointer\n ARM: ux500: switch to using pinctrl for uart0\n ARM: ux500: delete custom pin control system\n ARM: ux500: switch over to Nomadik pinctrl driver\n ...\n" }, { "commit": "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "tree": "bf3e38862b6e4e4c416a6e075b614f2c4befe3e9", "parents": [ "b324c67d4800e59171f48d9ddab6cbfb59110482", "0804dcb2afdcf014947ee98264041765f580d43f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:32:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:32:42 2012 -0700" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull support for new arm SoCs from Olof Johansson:\n \"Three new system-on-chip models are supported: the st-ericsson u9540\n in ux500, the sam9n12 in at91 and the emma ev2 in shmobile.\n\n Emma is a little bit special because it is completely unrelated to the\n classic shmobile models, but the new Renesas rmobile SoCs are a\n combination of things from both Emma and shmobile, so it was decided\n to have them all live in one directory.\n\n This also contains updates to existing shmobile soc code as well as\n some related board changes due to dependencies.\"\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)\n mach-shmobile: Use DT_MACHINE for KZM9D V3\n mach-shmobile: Emma Mobile EV2 DT support V3\n mach-shmobile: KZM9D board Ethernet support V3\n mach-shmobile: Emma Mobile EV2 GPIO support V3\n mach-shmobile: Emma Mobile EV2 SMP support V3\n mach-shmobile: KZM9D board support V3\n mach-shmobile: Emma Mobile EV2 SoC base support V3\n gpio: Emma Mobile GPIO driver V2\n ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict\n ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s\n ARM: mach-shmobile: clock-r8a7740: add MMCIF clock\n ARM: mach-shmobile: clock-r8a7740: add SDHI clock\n ARM: mach-shmobile: clock-r8a7740: add USB clock\n ARM: mach-shmobile: clock-r8a7740: add FSI clock\n ARM: mach-shmobile: r8a7740: cleanup I2C workaround method\n ARM: mach-shmobile: r8a7740: add gpio_irq support\n ARM: mach-shmobile: sh7372: Add FSI DMAEngine support\n ARM / mach-shmobile: Use preset_lpj with calibrate_delay()\n ARM: ux500: ioremap differences for DB9540\n ARM: ux500: core U9540 support\n ...\n" }, { "commit": "b324c67d4800e59171f48d9ddab6cbfb59110482", "tree": "a16509a710e76fa24c01514b60aed06b7db13716", "parents": [ "8dca6010d44cc722a94dc6da96560f9083dac782", "396d81cd0fe12ce5d1f6d159f093f9315d2837bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:30:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:30:52 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull device tree conversions for arm-soc, part 1, from Olof Johansson:\n \"The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game\n of booting using device trees, which is a great step forward for them.\n at91 and spear have pretty much completed this process with a huge\n amount of work being put into at91. The other platforms are\n continuing the process.\n\n We finally start to see the payback on this investment, as new\n machines are getting supported purely by adding a .dts source file\n that can be completely independent of the kernel source.\"\n\nFix up trivial conflict in arch/arm/Kconfig\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)\n ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files\n arm/dts: omap4-panda: Add LEDs support\n arm/dts: omap4-sdp: Add LEDs support\n arm/dts: twl4030: Add twl4030-gpio node\n OMAP4: devices: Do not create mcpdm device if the dtb has been provided\n OMAP4: devices: Do not create dmic device if the dtb has been provided\n Documentation: update docs for mmp dt\n ARM: dts: refresh dts file for arch mmp\n ARM: mmp: support pxa910 with device tree\n ARM: mmp: support mmp2 with device tree\n gpio: pxa: parse gpio from DTS file\n ARM: mmp: support DT in timer\n ARM: mmp: support DT in irq\n ARM: mmp: append CONFIG_MACH_MMP2_DT\n ARM: mmp: fix build issue on mmp with device tree\n ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree\n ARM: ux500: Disable SMSC911x platform code registration when DT is enabled\n ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement\n ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball\n ARM: SPEAr3xx: Correct keyboard data passed from DT\n ...\n" }, { "commit": "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "tree": "d500225e7a1c90a6bd17d3e63e2f6e781810db2b", "parents": [ "32b908eea9e5ecd1049008e134eadbfcd0da5e38", "0e896b1ddc1905df904df98c204bacf028219729" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull first batch of arm-soc cleanups from Olof Johansson:\n \"These cleanups are basically all over the place. The idea is to\n collect changes with minimal impact but large number of changes so we\n can avoid them from distracting in the diffstat in the other series.\n\n A significant number of lines get removed here, in particular because\n the ixp2000 and ixp23xx platforms get removed. These have never been\n extremely popular and have fallen into disuse over time with no active\n maintainer taking care of them. The u5500 soc never made it into a\n product, so we are removing it from the ux500 platform.\n\n Many good cleanups also went into the at91 and omap platforms, as has\n been the case for a number of releases.\"\n\nTrivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx}\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits)\n ARM: clps711x: Cleanup IRQ handling\n ARM clps711x: Removed unused header mach/time.h\n ARM: clps711x: Added note about support EP731x CPU to Kconfig\n ARM: clps711x: Added missing register definitions\n ARM: clps711x: Used own subarch directory for store header file\n Dove: Fix Section mismatch warnings\n ARM: orion5x: ts78xx debugging changes\n ARM: orion5x: remove PM dependency from ts78xx\n ARM: orion5x: ts78xx fix NAND resource off by one\n ARM: orion5x: ts78xx whitespace cleanups\n Orion5x: Fix Section mismatch warnings\n Orion5x: Fix warning: struct pci_dev declared inside paramter list\n ARM: clps711x: Combine header files into one for clps711x-targets\n ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c\n ARM: S3C24XX: Use common macro to define resources on mach-osiris.c\n ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable\n ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c\n ARM: S5PV210: Use common macro to define resources on dev-audio.c\n ARM: S5PC100: Use common macro to define resources on dev-audio.c\n ARM: S5P64X0: Use common macro to define resources on dev-audio.c\n ...\n" }, { "commit": "f7c2fe386ae92b471a0edd4fa4bed7033224b9bf", "tree": "8cb48fef02388eb5e64314aeb10143e5c20833cc", "parents": [ "9172b5d124c2f54374d8cc5ed6098ecd8fb988cd" ], "author": { "name": "Felten, Lothar", "email": "l-felten@ti.com", "time": "Sat May 12 04:36:38 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Tue May 22 06:48:02 2012 -0700" }, "message": "hwmon: INA219 and INA226 support\n\nAdd support for the Texas Instruments INA219 and INA226 power monitors.\n\nSigned-off-by: Lothar Felten \u003cl-felten@ti.com\u003e\n[guenter.roeck@ericsson.com: formatting cleanup; check for smbus word data;\n select PGA\u003d8 for INA219]\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "5f19f14fed7786652b9617c633db101d26a42251", "tree": "8796acab6d527fe6e64fe9aee39fa611d7ad082b", "parents": [ "c30b9c432ebb8951aa20fe825b5b8f1651628e3c" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 22 19:07:55 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 22 19:07:55 2012 +0900" }, "message": "sh: intc: Kill off special reservation interface.\n\nAt present reserving the IRLs in the IRQ bitmap in addition to the\ndropping of the legacy IRQ pre-allocation prevent IRL IRQs from being\nallocated for the x3proto board.\n\nThe only reason to permit reservations was to lock down possible hardware\nvectors prior to dynamic IRQ scanning, but this doesn\u0027t matter much given\nthat the hardware controller configuration is sorted before we get around\nto doing any dynamic IRQ allocation anyways. Beyond that, all of the\ntables are __init annotated, so quite a bit more work would need to be\ndone to support reconfiguring things like IRL controllers on the fly,\nmuch more than would ever make it worth the hassle.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "4d93914ae3db4a897ead4b1e33eca7cdfff4c6f7", "tree": "8e7c7b6ce6012f717e0c32929f5d632c930be745", "parents": [ "49e2754578b9f99bde18ad318d888a462d271479" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Thu May 17 02:23:27 2012 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:54:30 2012 +0100" }, "message": "drm: add plane properties\n\nThe omapdrm driver uses this for setting per-overlay rotation. It\nis likely also useful for setting YUV-\u003eRGB colorspace conversion\nmatrix, etc.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nReviewed-by: Paulo Zanoni \u003cpaulo.r.zanoni@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "49e2754578b9f99bde18ad318d888a462d271479", "tree": "9bba955211d37225a931ad45076354e2d149147d", "parents": [ "345f3b9035691d2d6e97398039b99fa484653cc4" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Thu May 17 02:23:26 2012 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:54:16 2012 +0100" }, "message": "drm: add bitmask property type\n\nA bitmask property is similar to an enum. The enum value is a bit\nposition (0-63), and valid property values consist of a mask of\nzero or more of (1 \u003c\u003c enum_val[n]).\n\n[airlied: 1LL -\u003e 1ULL]\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nReviewed-by: Paulo Zanoni \u003cpaulo.r.zanoni@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "345f3b9035691d2d6e97398039b99fa484653cc4", "tree": "5918971695857c8d424a8a7e05ed642604d132ae", "parents": [ "ebe0f2442cc4c5493a85c875d2d8a44ffecc1175", "d7f1642c90ab5eb2d7c48af0581c993094f97e1a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:39:57 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:39:57 2012 +0100" }, "message": "Merge branch \u0027exynos-drm-next\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-core-next\n\n* \u0027exynos-drm-next\u0027 of git://git.infradead.org/users/kmpark/linux-samsung:\n drm/exynos: add G2D driver\n drm/exynos: added vp scaling feature for hdmi\n drm/exynos: added source size to overlay structure\n drm/exynos: add additional display mode for hdmi\n drm/exynos: enable dvi mode for dvi monitor\n drm/exynos: fixed wrong pageflip finish event for interlace mode\n drm/exynos: add PM functions for hdmi and mixer\n drm/exynos: add dpms for hdmi\n drm/exynos: use threaded irq for hdmi hotplug\n drm/exynos: use platform_get_irq_byname for hdmi\n drm/exynos: cleanup for hdmi platform data\n drm/exynos: added a feature to get gem buffer information.\n drm/exynos: added drm prime feature.\n drm/exynos: added cache attribute support for gem.\n vgaarb: Provide dummy default device functions\n" }, { "commit": "e6ecefaadfcdb03db8ac9e739b4ba7a93a8811b3", "tree": "c24f4b93e492437d4ec88f00b65b3d400bfb5aee", "parents": [ "78b68556a964e74fb803b08c5b2d9c6ba3ec3787" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Thu May 17 13:27:23 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:35:07 2012 +0100" }, "message": "drm: Constify drm_mode_config_funcs pointer\n\nThe DRM mode config functions structure declared by drivers and pointed\nto by the drm_mode_config funcs field is never modified. Make it a const\npointer.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nCc: Inki Dae \u003cinki.dae@samsung.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nCc: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nReviwed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "78b68556a964e74fb803b08c5b2d9c6ba3ec3787", "tree": "2147b191085b2fef211e0b8048bf658dab178479", "parents": [ "3b02ab8893d45f17ae104588e337188127068a92" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Thu May 17 13:27:22 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:34:53 2012 +0100" }, "message": "drm: Constify gem_vm_ops pointer\n\nThe GEM vm operations structure is passed to the VM core that stores it\nin a const field. There vm operations structures can thus be const in\nDRM as well.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nCc: Inki Dae \u003cinki.dae@samsung.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3b02ab8893d45f17ae104588e337188127068a92", "tree": "27a83d4543233d151e8063ef75916897bca364a1", "parents": [ "4a1b0714275796fdbc35427cf361eb4123e5e9f6" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Thu May 17 13:27:20 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:34:33 2012 +0100" }, "message": "drm: Miscellaneous typo fixes and documentation updates\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "56ccd186f1837dd418cd094f0e96b3196bbab9ef", "tree": "195cdd3973a1288eb84f51f0ec28a947b333c2c5", "parents": [ "b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e", "d1257081aecf44455fcab8675f1d54e8b242faa1" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue May 22 11:32:31 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue May 22 11:32:31 2012 +0200" }, "message": "Merge branch \u0027upstream\u0027 into for-linus\n\nConflicts:\n\tdrivers/hid/hid-core.c\n" }, { "commit": "de44d97193fc67c1636c614fc302945e2912da1f", "tree": "1f825a00560633667f157b722d72138cb384ce92", "parents": [ "86c3c3beb83d6cf61cc1589b62aaec80e6ac2b8b" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Mon May 14 16:05:46 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:18:36 2012 +0100" }, "message": "drm/dp: Add DPCD defines for register 0x007\n\nLow four bits are downstream port count. High bit indicates peer OUI\nsupport. OUI matching will allow us to do additional per-sink handling\nfor things like DP-\u003eVGA bandwidth limits or (hopefully) the iMac-as-\ndisplay hack.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "86c3c3beb83d6cf61cc1589b62aaec80e6ac2b8b", "tree": "bca4b2b08e46806b571203f07ffbff2190c88063", "parents": [ "7beff62ee39d3ccf088bb77f61a63037f714d235" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Mon May 14 16:05:45 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:18:29 2012 +0100" }, "message": "drm/dp: Add DPCD OUI register defines\n\nDisplayPort has an escape hatch by which sources and sinks can identify\neach other. We would prefer not to notice this, but I suspect we\u0027re\ngoing to need to.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0f51596bd39a5c928307ffcffc9ba07f90f42a8b", "tree": "b636403815316ecad2170092b70f1079df260a95", "parents": [ "61f6c7a47a2f84b7ba4b65240ffe9247df772b06", "4ce63fcd919c32d22528e54dcd89506962933719" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "message": "Merge branch \u0027for-next-arm-dma\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/dma-mapping.c\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "048a8b8c89dc427dd7a58527c8923224b1e66d83", "tree": "c8e09964537839f3848d0ad0e25ee40e873c3d09", "parents": [ "f674ef7b43881b2ac11f98d6ba2dc5d9dd0dd118" ], "author": { "name": "Jim Kukunas", "email": "james.t.kukunas@linux.intel.com", "time": "Tue May 22 13:54:18 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue May 22 13:54:18 2012 +1000" }, "message": "lib/raid6: Add SSSE3 optimized recovery functions\n\nAdd SSSE3 optimized recovery functions, as well as a system\nfor selecting the most appropriate recovery functions to use.\n\nOriginally-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Jim Kukunas \u003cjames.t.kukunas@linux.intel.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "68f3f16d9ad0f1e28ab3fd0001ab5798c41f15a3", "tree": "fd023109413f5eb28b364663fdf4bf2eabca47d4", "parents": [ "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 21:42:32 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:52:30 2012 -0400" }, "message": "new helper: sigsuspend()\n\nguts of saved_sigmask-based sigsuspend/rt_sigsuspend. Takes\nkernel sigset_t *.\n\nOpen-coded instances replaced with calling it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "471368557a734c6c486ee757952c902b36e7fd01", "tree": "f192a77d2cb70b1d135e7be62418806e8c590a3e", "parents": [ "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "e0d8ffd1df44518cb9ac9b1807d1f13cc100fc2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:33:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:33:19 2012 -0700" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull core irq changes from Ingo Molnar:\n \"A collection of small fixes.\"\n\nBy Thomas Gleixner\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n hexagon: Remove select of not longer existing Kconfig switches\n arm: Select core options instead of redefining them\n genirq: Do not consider disabled wakeup irqs\n genirq: Allow check_wakeup_irqs to notice level-triggered interrupts\n genirq: Be more informative on irq type mismatch\n genirq: Reject bogus threaded irq requests\n genirq: Streamline irq_action\n" }, { "commit": "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "tree": "4322be35db678f6299348a76ad60a2023954af7d", "parents": [ "99262a3dafa3290866512ddfb32609198f8973e9", "ff2bb047c4bce9742e94911eeb44b4d6ff4734ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates from James Morris:\n \"New notable features:\n - The seccomp work from Will Drewry\n - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski\n - Longer security labels for Smack from Casey Schaufler\n - Additional ptrace restriction modes for Yama by Kees Cook\"\n\nFix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)\n apparmor: fix long path failure due to disconnected path\n apparmor: fix profile lookup for unconfined\n ima: fix filename hint to reflect script interpreter name\n KEYS: Don\u0027t check for NULL key pointer in key_validate()\n Smack: allow for significantly longer Smack labels v4\n gfp flags for security_inode_alloc()?\n Smack: recursive tramsmute\n Yama: replace capable() with ns_capable()\n TOMOYO: Accept manager programs which do not start with / .\n KEYS: Add invalidation support\n KEYS: Do LRU discard in full keyrings\n KEYS: Permit in-place link replacement in keyring list\n KEYS: Perform RCU synchronisation on keys prior to key destruction\n KEYS: Announce key type (un)registration\n KEYS: Reorganise keys Makefile\n KEYS: Move the key config into security/keys/Kconfig\n KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat\n Yama: remove an unused variable\n samples/seccomp: fix dependencies on arch macros\n Yama: add additional ptrace scopes\n ...\n" }, { "commit": "99262a3dafa3290866512ddfb32609198f8973e9", "tree": "6f74764150cd9c38d9ffacbeb5054b696537e154", "parents": [ "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "c6190804f1dc5357b57825f0491eb31fc9ccf130" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:20:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:20:23 2012 -0700" }, "message": "Merge tag \u0027virtio-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\nPull virtio updates from Rusty Russell.\n\n* tag \u0027virtio-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n virtio: fix typo in comment\n virtio-mmio: Devices parameter parsing\n virtio_blk: Drop unused request tracking list\n virtio-blk: Fix hot-unplug race in remove method\n virtio: Use ida to allocate virtio index\n virtio: balloon: separate out common code between remove and freeze functions\n virtio: balloon: drop restore_common()\n 9p: disconnect channel when PCI device is removed\n virtio: update documentation to v0.9.5 of spec\n" }, { "commit": "c6190804f1dc5357b57825f0491eb31fc9ccf130", "tree": "3a30265b8dcac17239d7461b71aec83107ba3e35", "parents": [ "81a054ce0b469b66c88e9da6403082759c64bf73" ], "author": { "name": "Chen Baozi", "email": "chenbaozi@gmail.com", "time": "Sun May 20 10:44:34 2012 +0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue May 22 12:16:16 2012 +0930" }, "message": "virtio: fix typo in comment\n\n- Delete \"@request_vqs\" and \"@free_vqs\" comments, since\n they are no longer in struct virtio_config_ops.\n- According to the macro below, \"@val\" should be \"@v\".\n\nSigned-off-by: Chen Baozi \u003cchenbaozi@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "tree": "2a2324b2572162059307db82f9238eeb25673a77", "parents": [ "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "203dacbdca977bedaba61ad2fca75d934060a5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "message": "Merge branch \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull smp hotplug cleanups from Thomas Gleixner:\n \"This series is merily a cleanup of code copied around in arch/* and\n not changing any of the real cpu hotplug horrors yet. I wish I\u0027d had\n something more substantial for 3.5, but I underestimated the lurking\n horror...\"\n\nFix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and\narch/sparc/include/asm/thread_info_32.h\n\n* \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)\n um: Remove leftover declaration of alloc_task_struct_node()\n task_allocator: Use config switches instead of magic defines\n sparc: Use common threadinfo allocator\n score: Use common threadinfo allocator\n sh-use-common-threadinfo-allocator\n mn10300: Use common threadinfo allocator\n powerpc: Use common threadinfo allocator\n mips: Use common threadinfo allocator\n hexagon: Use common threadinfo allocator\n m32r: Use common threadinfo allocator\n frv: Use common threadinfo allocator\n cris: Use common threadinfo allocator\n x86: Use common threadinfo allocator\n c6x: Use common threadinfo allocator\n fork: Provide kmemcache based thread_info allocator\n tile: Use common threadinfo allocator\n fork: Provide weak arch_release_[task_struct|thread_info] functions\n fork: Move thread info gfp flags to header\n fork: Remove the weak insanity\n sh: Remove cpu_idle_wait()\n ...\n" }, { "commit": "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "tree": "3969a9f612cd5596747ecde2066e65eacbab7d2e", "parents": [ "5ec29e3149d800e6db83c1b6ff441daf319cbbe2", "2d84e023cb5ec00403ff5d447533c6fd58fcc7ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:26:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:26:51 2012 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull RCU changes from Ingo Molnar:\n \"This is the v3.5 RCU tree from Paul E. McKenney:\n\n 1) A set of improvements and fixes to the RCU_FAST_NO_HZ feature (with\n more on the way for 3.6). Posted to LKML:\n https://lkml.org/lkml/2012/4/23/324 (commits 1-3 and 5),\n https://lkml.org/lkml/2012/4/16/611 (commit 4),\n https://lkml.org/lkml/2012/4/30/390 (commit 6), and\n https://lkml.org/lkml/2012/5/4/410 (commit 7, combined with\n the other commits for the convenience of the tester).\n\n 2) Changes to make rcu_barrier() avoid disrupting execution of CPUs\n that have no RCU callbacks. Posted to LKML:\n https://lkml.org/lkml/2012/4/23/322.\n\n 3) A couple of commits that improve the efficiency of the interaction\n between preemptible RCU and the scheduler, these two being all that\n survived an abortive attempt to allow preemptible RCU\u0027s\n __rcu_read_lock() to be inlined. The full set was posted to LKML at\n https://lkml.org/lkml/2012/4/14/143, and the first and third patches\n of that set remain.\n\n 4) Lai Jiangshan\u0027s algorithmic implementation of SRCU, which includes\n call_srcu() and srcu_barrier(). A major feature of this new\n implementation is that synchronize_srcu() no longer disturbs the\n execution of other CPUs. This work is based on earlier\n implementations by Peter Zijlstra and Paul E. McKenney. Posted to\n LKML: https://lkml.org/lkml/2012/2/22/82.\n\n 5) A number of miscellaneous bug fixes and improvements which were\n posted to LKML at: https://lkml.org/lkml/2012/4/23/353 with\n subsequent updates posted to LKML.\"\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)\n rcu: Make rcu_barrier() less disruptive\n rcu: Explicitly initialize RCU_FAST_NO_HZ per-CPU variables\n rcu: Make RCU_FAST_NO_HZ handle timer migration\n rcu: Update RCU maintainership\n rcu: Make exit_rcu() more precise and consolidate\n rcu: Move PREEMPT_RCU preemption to switch_to() invocation\n rcu: Ensure that RCU_FAST_NO_HZ timers expire on correct CPU\n rcu: Add rcutorture test for call_srcu()\n rcu: Implement per-domain single-threaded call_srcu() state machine\n rcu: Use single value to handle expedited SRCU grace periods\n rcu: Improve srcu_readers_active_idx()\u0027s cache locality\n rcu: Remove unused srcu_barrier()\n rcu: Implement a variant of Peter\u0027s SRCU algorithm\n rcu: Improve SRCU\u0027s wait_idx() comments\n rcu: Flip -\u003ecompleted only once per SRCU grace period\n rcu: Increment upper bit only for srcu_read_lock()\n rcu: Remove fast check path from __synchronize_srcu()\n rcu: Direct algorithmic SRCU implementation\n rcu: Introduce rcutorture testing for rcu_barrier()\n timer: Fix mod_timer_pinned() header comment\n ...\n" }, { "commit": "abd209b7083b2f3a2a19e522f688e7569f284e5d", "tree": "51b0d86562c2293df27ba8b6effc7a5ddd7c30f0", "parents": [ "513de477a09f770e42ad042bf830565d9c73a158", "fefe1ed1398b81e3fadc92d11d91162d343c8836" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:23:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:23:41 2012 -0700" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull iommu core changes from Ingo Molnar:\n \"The IOMMU changes in this cycle are mostly about factoring out\n Intel-VT-d specific IRQ remapping details and introducing struct\n irq_remap_ops, in preparation for AMD specific hardware.\"\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n iommu: Fix off by one in dmar_get_fault_reason()\n irq_remap: Fix the \u0027sub_handle\u0027 uninitialized warning\n irq_remap: Fix UP build failure\n irq_remap: Fix compiler warning with CONFIG_IRQ_REMAP\u003dy\n iommu: rename intr_remapping.[ch] to irq_remapping.[ch]\n iommu: rename intr_remapping references to irq_remapping\n x86, iommu/vt-d: Clean up interfaces for interrupt remapping\n iommu/vt-d: Convert MSI remapping setup to remap_ops\n iommu/vt-d: Convert free_irte into a remap_ops callback\n iommu/vt-d: Convert IR set_affinity function to remap_ops\n iommu/vt-d: Convert IR ioapic-setup to use remap_ops\n iommu/vt-d: Convert missing apic.c intr-remapping call to remap_ops\n iommu/vt-d: Make intr-remapping initialization generic\n iommu: Rename intr_remapping files to intel_intr_remapping\n" }, { "commit": "ff2bb047c4bce9742e94911eeb44b4d6ff4734ab", "tree": "9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f", "parents": [ "cffee16e8b997ab947de661e8820e486b0830c94", "c737f8284cac91428f8fcc8281e69117fa16e887" ], "author": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Tue May 22 11:21:06 2012 +1000" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Tue May 22 11:21:06 2012 +1000" }, "message": "Merge branch \u0027master\u0027 of git://git.infradead.org/users/eparis/selinux into next\n\nPer pull request, for 3.5.\n" }, { "commit": "85e184e4c3cd3e2285ceab91ff8f0cac094e8a85", "tree": "1c1cf2d82a62bf0bef4ee390f578dcec35f4b427", "parents": [ "382e6a859e6622de0aa62c01976ae8ebd90e986d", "766812e6d5e2e23be1e212cf84902d5e834dd865" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue May 22 02:58:55 2012 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue May 22 02:58:55 2012 +0200" }, "message": "Merge tag \u0027asoc-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus\n\nASoC: Last minute updates\n\nThese are all new code, they\u0027ve been in -next already so should be OK\nfor merge this time round. I\u0027d been planning to send a pull request\ntoday after they\u0027d had a bit of exposure there to make sure breakage\ndidn\u0027t propagate into your tree.\n" }, { "commit": "c23ddf7857bdb2e8001b0a058603497c765a580d", "tree": "f1d826612114a17d6ab543b7095adf04b5ba614a", "parents": [ "da4f58ffa08a7b7012fab9c205fa0f6ba40fec42", "cc169165c82e14ea43e313f937a0a475ca97e588" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 17:54:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 17:54:55 2012 -0700" }, "message": "Merge tag \u0027rdma-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull InfiniBand/RDMA changes from Roland Dreier:\n - Add ocrdma hardware driver for Emulex IB-over-Ethernet adapters\n - Add generic and mlx4 support for \"raw\" QPs: allow suitably privileged\n applications to send and receive arbitrary packets directly to/from\n the hardware\n - Add \"doorbell drop\" handling to the cxgb4 driver\n - A fairly large batch of qib hardware driver changes\n - A few fixes for lockdep-detected issues\n - A few other miscellaneous fixes and cleanups\n\nFix up trivial conflict in drivers/net/ethernet/emulex/benet/be.h.\n\n* tag \u0027rdma-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (53 commits)\n RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree\n IB/mlx4: Fix mlx4_ib_add() error flow\n IB/core: Fix IB_SA_COMP_MASK macro\n IB/iser: Fix error flow in iser ep connection establishment\n IB/mlx4: Increase the number of vectors (EQs) available for ULPs\n RDMA/cxgb4: Add query_qp support\n RDMA/cxgb4: Remove kfifo usage\n RDMA/cxgb4: Use vmalloc() for debugfs QP dump\n RDMA/cxgb4: DB Drop Recovery for RDMA and LLD queues\n RDMA/cxgb4: Disable interrupts in c4iw_ev_dispatch()\n RDMA/cxgb4: Add DB Overflow Avoidance\n RDMA/cxgb4: Add debugfs RDMA memory stats\n cxgb4: DB Drop Recovery for RDMA and LLD queues\n cxgb4: Common platform specific changes for DB Drop Recovery\n cxgb4: Detect DB FULL events and notify RDMA ULD\n RDMA/cxgb4: Drop peer_abort when no endpoint found\n RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()\n mlx4_core: Change bitmap allocator to work in round-robin fashion\n RDMA/nes: Don\u0027t call event handler if pointer is NULL\n RDMA/nes: Fix for the ORD value of the connecting peer\n ...\n" }, { "commit": "da4f58ffa08a7b7012fab9c205fa0f6ba40fec42", "tree": "76317ee98eadbb8457e045dd0375652b14224451", "parents": [ "ba01a87e37d3ca9efe141e2907c2ec3f89490b4f", "e34693336564f02b3e2cc09d8b872aef22a154e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 17:46:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 17:46:21 2012 -0700" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi\n\nPull SCSI misc update from James Bottomley:\n \"The patch contains the usual assortment of driver updates (be2iscsi,\n bfa, bnx2i, fcoe, hpsa, isci, lpfc, megaraid, mpt2sas, pm8001, sg)\n plus an assortment of other changes and fixes. Also new is the fact\n that the isci update is delivered as a git merge (with signed tag).\"\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (158 commits)\n isci: End the RNC resumption wait when the RNC is destroyed.\n isci: Fixed RNC bug that lost the suspension or resumption during destroy\n isci: Fix RNC AWAIT_SUSPENSION-\u003eINVALIDATING transition.\n isci: Manage the IREQ_NO_AUTO_FREE_TAG under scic_lock.\n isci: Remove obviated host callback list.\n isci: Check IDEV_GONE before performing abort path operations.\n isci: Restore the ATAPI device RNC management code.\n isci: Don\u0027t wait for an RNC suspend if it\u0027s being destroyed.\n isci: Change the phy control and link reset interface for HW reasons.\n isci: Added timeouts to RNC suspensions in the abort path.\n isci: Add protocol indicator for TMF requests.\n isci: Directly control IREQ_ABORT_PATH_ACTIVE when completing TMFs.\n isci: Wait for RNC resumption before leaving the abort path.\n isci: Fix RNC suspend call for SCI_RESUMING state.\n isci: Manage tag releases differently when aborting tasks.\n isci: Callbacks to libsas occur under scic_lock and are synchronized.\n isci: When in the abort path, defeat other resume calls until done.\n isci: Implement waiting for suspend in the abort path.\n isci: Make sure all TCs are terminated and cleaned in LUN reset.\n isci: Manage the LLHANG timer enable/disable per-device.\n ...\n" }, { "commit": "c9bfa7d75ba7269c97595f03c3152372e8b37823", "tree": "18ff08a09721a21fda585c716574344220a50518", "parents": [ "f4c16c581766a230c02bec4d513b09fe36264ae2", "f80e8ed3951455272c12693e35b259be8eb60b30" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 17:37:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 17:37:09 2012 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nPull scsi-target changes from Nicholas Bellinger:\n \"There has been lots of work in existing code in a number of areas this\n past cycle. The major highlights have been:\n\n * Removal of transport_do_task_sg_chain() from core + fabrics\n (Roland)\n * target-core: Removal of se_task abstraction from target-core and\n enforce hw_max_sectors for pSCSI backends (hch)\n * Re-factoring of iscsi-target tx immediate/response queues (agrover)\n * Conversion of iscsi-target back to using target core memory\n allocation logic (agrover)\n\n We\u0027ve had one last minute iscsi-target patch go into for-next to\n address a nasty regression bug related to the target core allocation\n logic conversion from agrover that is not included in friday\u0027s\n linux-next build, but has been included in this series.\n\n On the new fabric module code front for-3.5, here is a brief status\n update for the three currently in flight this round:\n\n * usb-gadget target driver:\n\n Sebastian Siewior\u0027s driver for supporting usb-gadget target mode\n operation. This will be going out as a separate PULL request from\n target-pending/usb-target-merge with subsystem maintainer ACKs. There\n is one minor target-core patch in this series required to function.\n\n * sbp ieee-1394/firewire target driver:\n\n Chris Boot\u0027s driver for supportting the Serial Block Protocol (SBP)\n across IEEE-1394 Firewire hardware. This will be going out as a\n separate PULL request from target-pending/sbp-target-merge with two\n additional drivers/firewire/ patches w/ subsystem maintainer ACKs.\n\n * qla2xxx LLD target mode infrastructure changes + tcm_qla2xxx:\n\n The Qlogic \u003e\u003d 24xx series HW target mode LLD infrastructure patch-set\n and tcm_qla2xxx fabric driver. Support for FC target mode using\n qla2xxx LLD code has been officially submitted by Qlogic to James\n below, and is currently outstanding but not yet merged into\n scsi.git/for-next..\n\n [PATCH 00/22] qla2xxx: Updates for scsi \"misc\" branch\n http://www.spinics.net/lists/linux-scsi/msg59350.html\n\n Note there are *zero* direct dependencies upon this for-next series\n for the qla2xxx LLD target + tcm_qla2xxx patches submitted above, and\n over the last days the target mode team has been tracking down an\n tcm_qla2xxx specific active I/O shutdown bug that appears to now be\n almost squashed for 3.5-rc-fixes.\"\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (47 commits)\n iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs\n iscsi-target: remove dead code in iscsi_check_valuelist_for_support\n target: Handle ATA_16 passthrough for pSCSI backend devices\n target: Add MI_REPORT_TARGET_PGS ext. header + implict_trans_secs attribute\n target: Fix MAINTENANCE_IN service action CDB checks to use lower 5 bits\n target: add support for the WRITE_VERIFY command\n target: make target_put_session void\n target: cleanup transport_execute_tasks()\n target: Remove max_sectors device attribute for modern se_task less code\n target: lock \u003d\u003e unlock typo in transport_lun_wait_for_tasks\n target: Enforce hw_max_sectors for SCF_SCSI_DATA_SG_IO_CDB\n target: remove the t_se_count field in struct se_cmd\n target: remove the t_task_cdbs_ex_left field in struct se_cmd\n target: remove the t_task_cdbs_left field in struct se_cmd\n target: remove struct se_task\n target: move the state and execute lists to the command\n target: simplify command to task linkage\n target: always allocate a single task\n target: replace -\u003eexecute_task with -\u003eexecute_cmd\n target: remove the task_sectors field in struct se_task\n ...\n" }, { "commit": "3d1482fe7a835a18cb45894ed67f15466b60190f", "tree": "9a97af186208e89f4f60312b3033fedbe6dbfc5c", "parents": [ "ac1806572df55b6125ad9d117906820dacfa3145", "4f6a16bf019cb0bbe1deb7d3a83d3593dcce8706" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:58:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:58:23 2012 -0700" }, "message": "Merge tag \u0027pinctrl-for-v3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pin control subsystem changes from Linus Walleij:\n\n - Generic Device Tree bindings and hooks for drivers so we can move\n over modern drivers to using this.\n\n - Device Tree bindings for Tegra SoCs.\n\n - Funneling some devicetree helper code for the drivers/of subsystem.\n\n - New pin control drivers for:\n * Freescale MXS\n * Freescale i.MX51\n * Freescale i.MX53\n All of these use Device Tree bindings.\n\n - Dummy pinctrl handles for stepwise migration to pinctrl, akin to\n dummy regulators.\n - Minor non-urgent fixes and improvments.\n\nFix up trivial conflicts in Documentation/driver-model/devres.txt and\ndrivers/pinctrl/core.c,\n\n* tag \u0027pinctrl-for-v3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (46 commits)\n pinctrl: pinctrl-imx: add imx51 pinctrl driver\n pinctrl: pinctrl-imx: add imx53 pinctrl driver\n pinctrl: pinctrl-pxa3xx: remove empty pinmux disable function\n pinctrl: pinctrl-mxs: remove empty pinmux disable function\n pinctrl: pinctrl-imx: remove empty pinmux disable function\n pinctrl: make pinmux disable function optional\n pinctrl: a minor error checking improvement for pinconf\n pinctrl: mxs: skip gpio nodes for group creation\n pinctrl: mxs: create group for pin config node\n pinctrl: (cosmetic) fix two entries in DocBook comments\n pinctrl: add more info to error msgs in pin_request\n pinctrl: add pinctrl-mxs support\n pinctrl: pinctrl-imx: add imx6q pinctrl driver\n pinctrl: pinctrl-imx: add imx pinctrl core driver\n dt: add of_get_child_count helper function\n pinctrl: support gpio request deferred probing\n pinctrl: add pinctrl_provide_dummies interface for platforms to use\n pinctrl: enhance reporting of errors when loading from DT\n pinctrl: add kerneldoc for pinctrl_ops device tree functions\n pinctrl: propagate map validation errors\n ...\n" }, { "commit": "ac1806572df55b6125ad9d117906820dacfa3145", "tree": "6831707507d54e20d561a6403d2ff3e8469909ce", "parents": [ "ae82a8282031e3c31a4f68c5381ee459e42908f8", "84df8c1241beb87fec73415ef4f6e627aca34835" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:49:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:49:16 2012 -0700" }, "message": "Merge tag \u0027regulator-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator updates from Mark Brown:\n \"The major thing here is the addition of some helpers to factor code\n out of drivers, making a fair proportion of regulators much more just\n data rather than code which is nice.\n\n - Helpers in the core for regulators using regmap, providing generic\n implementations of the enable and voltage selection operations which\n just need data to describe them in the drivers.\n - Split out voltage mapping and voltage setting, allowing many more\n drivers to take advantage of the infrastructure for selectors.\n - Loads and loads of cleanups from Axel Lin once again, including many\n changes to take advantage of the above new framework features\n - New drivers for Ricoh RC5T583, TI TPS62362, TI TPS62363, TI\n TPS65913, TI TWL6035 and TI TWL6037.\n\n Some of the registration changes to support the core refactoring\n caused so many conflicts that eventually topic branches were abandoned\n for this release.\"\n\n* tag \u0027regulator-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (227 commits)\n regulator: tps65910: use of_node of matched regulator being register\n regulator: tps65910: dt: support when \"regulators\" node found\n regulator: tps65910: add error message in case of failure\n regulator: tps62360: dt: initialize of_node param for regulator register.\n regulator: tps65910: use devm_* for memory allocation\n regulator: tps65910: use small letter for regulator names\n mfd: tpx6586x: Depend on regulator\n regulator: regulator for Palmas Kconfig\n regulator: regulator driver for Palmas series chips\n regulator: Enable Device Tree for the db8500-prcmu regulator driver\n regulator: db8500-prcmu: Separate regulator registration from probe\n regulator: ab3100: Use regulator_map_voltage_iterate()\n regulator: tps65217: Convert to set_voltage_sel and map_voltage\n regulator: Enable the ab8500 for Device Tree\n regulator: ab8500: Split up probe() into manageable pieces\n regulator: max8925: Remove check_range function and max_uV from struct rc5t583_regulator_info\n regulator: max8649: Remove unused check_range() function\n regulator: rc5t583: Remove max_uV from struct rc5t583_regulator_info\n regulator: da9052: Convert to set_voltage_sel and map_voltage\n regulator: max8952: Use devm_kzalloc\n ...\n" }, { "commit": "ae82a8282031e3c31a4f68c5381ee459e42908f8", "tree": "b44f69623afe44d57d5c0fa83f000ec1edda408f", "parents": [ "3bb07f1b73ea6313b843807063e183e168c9182a", "c948ef3ae71c18c1079333b65d6887ceb4577618" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:32:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:32:44 2012 -0700" }, "message": "Merge tag \u0027regmap-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull regmap updates from Mark Brown:\n \"A surprisingly large series of updates for regmap this time, mostly\n due to all the work Stephen Warren has done to add support for MMIO\n buses. This wasn\u0027t really the target for the framework but it turns\n out that there\u0027s a reasonable number of cases where it\u0027s very helpful\n to use the register cache support to allow the register map to remain\n available while the device is suspended.\n\n - A MMIO bus implementation, contributed by Stephen Warren. Currently\n this is limited to 32 bit systems and native endian registers.\n - Support for naming register maps, mainly intended for MMIO devices\n with multiple register banks. This was also contributed by Stephen\n Warren.\n - Support for register striding, again contributed by Stephen Warren\n and mainly intended for use with MMIO as typically the registers\n will be a fixed size but byte addressed.\n - irqdomain support for the generic regmap irq_chip, including support\n for dynamically allocate interrupt numbers.\n - A function dev_get_regmap() which allows frameworks using regmap to\n obtain the regmap for a device from the struct device, making life a\n little simpler for them.\n - Updates to regmap-irq to support more chips (contributed by Graeme\n Gregory) and to use irqdomains.\n - Support for devices with 24 bit register addresses.\n\n The striding support collided with all the topic branches so the\n branches look a bit messy and eventually I just gave up. There\u0027s also\n the TI Palmas driver and a couple of other isolated MFD patches that\n all depend on new regmap features so are being merged here.\"\n\n* tag \u0027regmap-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (24 commits)\n mfd: palmas PMIC device support Kconfig\n mfd: palmas PMIC device support\n regmap: Fix typo in IRQ register striding\n mfd: wm8994: Update to fully use irq_domain\n regmap: add support for non contiguous status to regmap-irq\n regmap: Convert regmap_irq to use irq_domain\n regmap: Pass back the allocated regmap IRQ controller data\n mfd: da9052: Fix genirq abuse\n regmap: Implement dev_get_regmap()\n regmap: Devices using format_write don\u0027t support bulk operations\n regmap: Converts group operation into single read write operations\n regmap: Cache single values read from the chip\n regmap: fix compile errors in regmap-irq.c due to stride changes\n regmap: implement register striding\n regmap: fix compilation when !CONFIG_DEBUG_FS\n regmap: allow regmap instances to be named\n regmap: validate regmap_raw_read/write val_len\n regmap: mmio: remove some error checks now in the core\n regmap: mmio: convert some error returns to BUG()\n regmap: add MMIO bus support\n ...\n" }, { "commit": "3bb07f1b73ea6313b843807063e183e168c9182a", "tree": "f0e2ab77b8bc993a843a0edede00668c589863cc", "parents": [ "6326c71fd2fb3bef5fa33951479298b683da35fe", "5420e46d4d79bcd5d5952df98d022c8412385d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:24:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:24:54 2012 -0700" }, "message": "Merge tag \u0027pci-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI changes from Bjorn Helgaas:\n - Host bridge cleanups from Yinghai\n - Disable Bus Master bit on PCI device shutdown (kexec-related)\n - Stratus ftServer fix\n - pci_dev_reset() locking fix\n - IvyBridge graphics erratum workaround\n\n* tag \u0027pci-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)\n microblaze/PCI: fix \"io_offset undeclared\" error\n x86/PCI: only check for spinlock being held in SMP kernels\n resources: add resource_overlaps()\n PCI: fix uninitialized variable \u0027cap_mask\u0027\n MAINTAINERS: update PCI git tree and patchwork\n PCI: disable Bus Master on PCI device shutdown\n PCI: work around IvyBridge internal graphics FLR erratum\n x86/PCI: fix unused variable warning in amd_bus.c\n PCI: move mutex locking out of pci_dev_reset function\n PCI: work around Stratus ftServer broken PCIe hierarchy\n x86/PCI: merge pcibios_scan_root() and pci_scan_bus_on_node()\n x86/PCI: dynamically allocate pci_root_info for native host bridge drivers\n x86/PCI: embed pci_sysdata into pci_root_info on ACPI path\n x86/PCI: embed name into pci_root_info struct\n x86/PCI: add host bridge resource release for _CRS path\n x86/PCI: refactor get_current_resources()\n PCI: add host bridge release support\n PCI: add generic device into pci_host_bridge struct\n PCI: rename pci_host_bridge() to find_pci_root_bridge()\n x86/PCI: fix memleak with get_current_resources()\n ...\n" }, { "commit": "190d3b6b4ab0e1ce991e8bc94ad95f00b0dc476b", "tree": "a1b0ca2e5114f3657b91727f48a036392a3b17a8", "parents": [ "cd5398bed9296d1ddb21630ac17e90cd19a5c62e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri May 18 16:09:53 2012 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 21 16:16:58 2012 -0700" }, "message": "time: remove obsolete declaration\n\nThe function, timekeeping_leap_insert, was removed in commit\n6b43ae8a619d17c4935c3320d2ef9e92bdeed05d\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "ff8ce5f67ddca709fe59e6173f89260f0fdc2b22", "tree": "90d3ad380b290d251b54590be485b2ffb4528e5a", "parents": [ "4f6ade91532b5b05ea28219b891f12a3cec528cd", "4ab1056766a4e49f6b9ef324313dd1583f8f8f4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull core ARM updates from Russell King:\n \"This is the bulk of the core ARM updates for this merge window.\n Included in here is a different way to handle the VIVT cache flushing\n on context switch, which should allow scheduler folk to remove a\n special case in their core code.\n\n We have architectured timer support here, which is a set of timers\n specified by the ARM architecture for future SoCs. So we should see\n less variability in timer design going forward.\n\n The last big thing here is my cleanup to the way we handle PCI across\n ARM, fixing some oddities in some platforms which hadn\u0027t realised\n there was a way to deal with their private data already built in to\n our PCI backend.\n\n I\u0027ve also removed support for the ARMv3 architecture; it hasn\u0027t worked\n properly for years so it seems pointless to keep it around.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (47 commits)\n ARM: PCI: remove per-pci_hw list of buses\n ARM: PCI: dove/kirkwood/mv78xx0: use sys-\u003eprivate_data\n ARM: PCI: provide a default bus scan implementation\n ARM: PCI: get rid of pci_std_swizzle()\n ARM: PCI: versatile: fix PCI interrupt setup\n ARM: PCI: integrator: use common PCI swizzle\n ARM: 7416/1: LPAE: Remove unused L_PTE_(BUFFERABLE|CACHEABLE) macros\n ARM: 7415/1: vfp: convert printk\u0027s to pr_*\u0027s\n ARM: decompressor: avoid speculative prefetch from non-RAM areas\n ARM: Remove ARMv3 support from decompressor\n ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level\n ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs\n ARM: 7363/1: DEBUG_LL: limit early mapping to the minimum\n ARM: 7391/1: versatile: add some auxdata for device trees\n ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller\n AMBA: get rid of last two uses of NO_IRQ\n ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails\n ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held\n ARM: 7404/1: cmpxchg64: use atomic64 and local64 routines for cmpxchg64\n ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode\n ...\n" }, { "commit": "4f6ade91532b5b05ea28219b891f12a3cec528cd", "tree": "8a684205449b2db0798fc22c9f03c40afa9cc849", "parents": [ "31a67102f4762df5544bc2dfb34a931233d2a5b2", "e9d7f4065408e92338a41b809e437c6e043da090" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 15:59:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 15:59:46 2012 -0700" }, "message": "Merge branch \u0027clkdev\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull clkdev updates from Russell King:\n \"This supplements clkdev with a device-managed API, allowing drivers\n cleanup paths to be simplified. We also optimize clk_find() so that\n it exits as soon as it finds a perfect match, and we provide a way to\n minimise the amount of code platforms need to register clkdev entries.\n\n Some of the code in arm-soc depends on these changes.\"\n\n* \u0027clkdev\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n CLKDEV: provide helpers for common clock framework\n ARM: 7392/1: CLKDEV: Optimize clk_find()\n ARM: 7376/1: clkdev: Implement managed clk_get()\n" }, { "commit": "881bcabbde8bc13854a2cb30847abe181d31c5fd", "tree": "4903428777c03b76d8f2b6cdc782098213300126", "parents": [ "e60b9a0346ee08af4715ee5b2d82f705fbe6e309", "f25e918e3546477948be999c3a7d56b316d74e4b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 12:43:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 12:43:54 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\nPull m68k updates from Geert Uytterhoeven.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k: Setup CROSS_COMPILE at the top\n m68k: Correct the Atari ALLOWINT definition\n m68k/video: Create \u003casm/vga.h\u003e\n m68k: Make sure {read,write}s[bwl]() are always defined\n m68k/mm: Port OOM changes to do_page_fault()\n scsi/atari: Make more functions static\n scsi/atari: Revive \"atascsi\u003d\" setup option\n net/ariadne: Improve debug prints\n m68k/atari: Change VME irq numbers from unsigned long to unsigned int\n m68k/amiga: Use arch_initcall() for registering platform devices\n m68k/amiga: Add error checks when registering platform devices\n m68k/amiga: Mark z_dev_present() __init\n m68k: Remove unused MAX_NOINT_IPL definition\n" }, { "commit": "0ad8c6a22d03a1598f7cc6585c65354dadca62ad", "tree": "1507deef3d55d5f3c71b2f76924fe1f6c6211905", "parents": [ "8527f8e2934683e53405fbe876a4e6f4a0c46eb8", "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Mon May 21 21:39:42 2012 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Mon May 21 21:39:42 2012 +0200" }, "message": "Merge tag \u0027v3.4\u0027 with SCSI updates, needed for subsequent firewire-sbp2 changes\n\nLinux 3.4\n" }, { "commit": "875682648b89a3ebc06176d60dc280f810647839", "tree": "515e2e1d69b18954b6e750e5e1aa042cc29c6bee", "parents": [ "985a94a96d294fe6d2c72d013de09b81b637ed58" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Tue Apr 17 22:37:16 2012 +0200" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Mon May 21 21:09:38 2012 +0200" }, "message": "irq: Remove irq_chip-\u003erelease()\n\nAs it\u0027s only user (UML) does no longer need it we can get\nrid of it.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" } ], "next": "68c2c39a76b094e9b2773e5846424ea674bf2c46" }