Changes in TODO

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/dma/TODO

a02001086bbfb4da35d1228bebc2f1b442db455f - Merge Linus' tree to be be to apply submitted patches to newer code than

Thu, 20 Nov 2014 14:42:02 +0100

Merge Linus' tree to be be to apply submitted patches to newer code thancurrent trivial.git base List of files: /linux/drivers/dma/TODO

b10778a00d40b3d9fdaaf5891e802794781ff71c - Merge commit 'v3.17' into next

Wed, 19 Nov 2014 11:32:12 +0100

Merge commit 'v3.17' into next List of files: /linux/drivers/dma/TODO

890ca861f868a10617029ffc87eae7d48ea6876c - Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.

Wed, 12 Nov 2014 15:09:01 +0100

Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.Signed-off-by: Ingo Molnar List of files: /linux/drivers/dma/TODO

ee5db7e47faccd07a8a17f73afb30345f8331e61 - Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus

Mon, 06 Oct 2014 23:34:40 +0200

Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus List of files: /linux/drivers/dma/TODO

447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 - Merge branch 'next' into for-linus

Fri, 03 Oct 2014 20:24:46 +0200

Merge branch 'next' into for-linusPrepare first round of input updates for 3.18. List of files: /linux/drivers/dma/TODO

db985cbd67c45f875ef43cb5febfaa8cbd203c27 - Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core

Sun, 14 Sep 2014 15:34:38 +0200

Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/coreirqchip core changes for v3.18 - renesas: suspend to RAM, runtime PM, cleanups and DT binding docs - keystone: add new driver - hip04: add Hisilicon HiP04 driver (without touching irq-gic.c) - gic: Use defines instead of magic number, preserve v2 bybass bits - handle_domain_irq: common low level interrupt entry handler List of files: /linux/drivers/dma/TODO

336879b1da97fffc097f77c6d6f818660f2826f0 - Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework

Thu, 11 Sep 2014 14:46:53 +0200

Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-reworkDave asked me to do the backmerge before sending him the revised pullrequest, so here we go. Nothing fancy in the conflicts, just a fewthings changed right next to each another.Conflicts: drivers/gpu/drm/drm_irq.cSigned-off-by: Daniel Vetter List of files: /linux/drivers/dma/TODO

e2627dce268024aff962132057cb8acb219c9c40 - Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches, and to refresh the tree

Mon, 08 Sep 2014 08:11:07 +0200

Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches, and to refresh the treeLinux 3.17-rc4 List of files: /linux/drivers/dma/TODO

516d5f8b04ce2bcd24f03323fc743ae25b81373d - Merge tag 'v3.17-rc3' into next

Thu, 04 Sep 2014 01:01:36 +0200

Merge tag 'v3.17-rc3' into nextSync with mainline to bring in Chrome EC changes. List of files: /linux/drivers/dma/TODO

05244d166739ae273fdc7a2151bdef61df49ca7d - Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Wed, 03 Sep 2014 16:57:41 +0200

Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v3.17A few more driver specific fixes on top of the currently pending fixes(which are already in your tree but not Linus'). List of files: /linux/drivers/dma/TODO

83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb - Merge branch 'linus' into perf/core, to fix conflicts

Sun, 24 Aug 2014 22:32:24 +0200

Merge branch 'linus' into perf/core, to fix conflictsConflicts: arch/x86/kernel/cpu/perf_event_intel_uncore*.cSigned-off-by: Ingo Molnar List of files: /linux/drivers/dma/TODO

80b304fd00e8b667775ff791121b61ecd7cd0c03 - Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

Fri, 22 Aug 2014 10:04:15 +0200

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgentPull EFI fixes from Matt Fleming: * WARN_ON(!spin_is_locked()) always triggers on non-SMP machines. Swap it for the more canonical lockdep_assert_held() which always does the right thing - Guenter Roeck * Assign the correct value to efi.runtime_version on arm64 so that all the runtime services can be invoked - Semen ProtsenkoSigned-off-by: Ingo Molnar List of files: /linux/drivers/dma/TODO

2871f352c600d36b1b8ba57c79029cf8aa512948 - Merge tag 'v3.17-rc1' into patchwork

Thu, 21 Aug 2014 22:23:58 +0200

Merge tag 'v3.17-rc1' into patchworkLinux 3.17-rc1 List of files: /linux/drivers/dma/TODO

5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 - Merge l2-mtd/next into l2-mtd/master

Tue, 19 Aug 2014 20:57:23 +0200

Merge l2-mtd/next into l2-mtd/master List of files: /linux/drivers/dma/TODO

c7a19c795b4b0a3232c157ed29eea85077e95da6 - Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Mon, 11 Aug 2014 16:14:01 +0200

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dmaPull slave-dma updates from Vinod Koul: "Some notable changes are: - new driver for AMBA AXI NBPF by Guennadi - new driver for sun6i controller by Maxime - pl330 drivers fixes from Lar's - sh-dma updates and fixes from Laurent, Geert and Kuninori - Documentation updates from Geert - drivers fixes and updates spread over dw, edma, freescale, mpc512x etc.."* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (72 commits) dmaengine: sun6i: depends on RESET_CONTROLLER dma: at_hdmac: fix invalid remaining bytes detection dmaengine: nbpfaxi: don't build this driver where it cannot be used dmaengine: nbpf_error_get_channel() can be static dma: pl08x: Use correct specifier for size_t values dmaengine: Remove the context argument to the prep_dma_cyclic operation dmaengine: nbpfaxi: convert to tasklet dmaengine: nbpfaxi: fix a theoretical race dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores dmaengine: add device tree binding documentation for the nbpfaxi driver dmaengine: edma: Do not register second device when booted with DT dmaengine: edma: Do not change the error code returned from edma_alloc_slot dmaengine: rcar-dmac: Add device tree bindings documentation dmaengine: shdma: Allocate cyclic sg list dynamically dmaengine: shdma: Make channel filter ignore unrelated devices dmaengine: sh: Rework Kconfig and Makefile dmaengine: sun6i: Fix memory leaks dmaengine: sun6i: Free the interrupt before killing the tasklet dmaengine: sun6i: Remove switch statement from buswidth convertion routine dmaengine: of: kconfig: select DMA_ENGINE when DMA_OF is selected ... List of files: /linux/drivers/dma/TODO

dd8ecfcac66b4485416b2d1df0ec4798b198d7d6 - dmaengine: dw: don't perform DMA when dmaengine_submit is called

Wed, 18 Jun 2014 11:15:38 +0200

dmaengine: dw: don't perform DMA when dmaengine_submit is calledAccordingly to discussion [1] and followed up documentation the DMA controllerdriver shouldn't start any DMA operations when dmaengine_submit() is called.This patch fixes the workflow in dw_dmac driver to follow the documentation.[1] http://www.spinics.net/lists/arm-kernel/msg125987.htmlSigned-off-by: Andy Shevchenko Signed-off-by: Vinod Koul List of files: /linux/drivers/dma/TODO

e4da3fbfbd1de56d2367653e3823e6445e49f8a9 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next

Thu, 01 Dec 2011 11:14:48 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next List of files: /linux/drivers/dma/TODO

d4bbf7e7759afc172e2bfbc5c416324590049cdd - Merge branch 'master' into x86/memblock

Mon, 28 Nov 2011 18:46:22 +0100

Merge branch 'master' into x86/memblockConflicts & resolutions:* arch/x86/xen/setup.c dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..." conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve().* drivers/pci/intel-iommu.c 166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3d "bootmem: Replace work_with_active_regions() with..." conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file.* mm/Kconfig 6661672053a "memblock: add NO_BOOTMEM config symbol" c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option" conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict.* mm/memblock.c d1f0ece6cdc "mm/memblock.c: small function definition fixes" ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()" confliected. The former updates function removed by the latter. Resolution is trivial.Signed-off-by: Tejun Heo List of files: /linux/drivers/dma/TODO

6ad390a25a9d1d8606b9b826878f0a30639dc2b3 - Merge branch 'next' into for-linus

Thu, 27 Oct 2011 06:46:20 +0200

Merge branch 'next' into for-linus List of files: /linux/drivers/dma/TODO