mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 11:21:33 +00:00
d0cd84817c
1/ Step down as dmaengine maintainer see commit08223d80df"dmaengine maintainer update" 2/ Removal of net_dma, as it has been marked 'broken' since 3.13 (commit7787380336"net_dma: mark broken"), without reports of performance regression. 3/ Miscellaneous fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUKDLKAAoJEB7SkWpmfYgC7wwP/iNHqRjf1suMUTBIF3P6Hgbe VCUwh0IkuujMPDG46WRn6cYzarRxVPLoGaLHLPszgjI6pmGPVv19wqeDOlUxtcmr 0iQWEWv/zqseaAIW+4gj/WYCyMgKil49EUBJKCZCfNmIaad+e0pr8f0uE5yOkHPM tqWoZERu9A4dlXGr1TjeOZVzdnPrCt92MrLDN6ZZ6tMuJaEc5PauaLxKTeGy5fYj UB+k1xJQzECbsYfpB+uCVYl5/qPO1rNyuBYS8THCsW+JYmrbbfH2kkF2lo2FaUpO 8Yd50FtzXHKWwAt7BzfIwU2M7x0wRmryrC/xsQi6M+WmVeHYvvHUIpzaA66xRZ5x fCy3Fu8sEnmnmboAbh2v2c5uTycqRl2xPzbpLAuxglloXIxzi3ckp6ESF/Z4SldH oxIoEievN7lah3vKgvlHZYcWDzrYr8EKf/EzFe9RqDBQDKtzDzre1H9Uivr387Vm uFUcGHYG/GXuX47C7EUsMtaSW2UEoR2ytw/HR6CKFPTVXwAzEO6kA9vg0EqL0iIq 2wVLgavlZuwegmaUBgnr+bgVZMvVN7OU7fAIRVe5xNO6itrPKvheSlQthmRiiq9C uzOu4PS6PexqzHUNPCcJpCsj+lawmCSrE0bxtPzTA/CQInVgWs219V9+W5Gn/0YA EARN9k6ueX9PZPQrPQLm =BBBv -----END PGP SIGNATURE----- Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine Pull dmaengine updates from Dan Williams: "Even though this has fixes marked for -stable, given the size and the needed conflict resolutions this is 3.18-rc1/merge-window material. These patches have been languishing in my tree for a long while. The fact that I do not have the time to do proper/prompt maintenance of this tree is a primary factor in the decision to step down as dmaengine maintainer. That and the fact that the bulk of drivers/dma/ activity is going through Vinod these days. The net_dma removal has not been in -next. It has developed simple conflicts against mainline and net-next (for-3.18). Continuing thanks to Vinod for staying on top of drivers/dma/. Summary: 1/ Step down as dmaengine maintainer see commit08223d80df"dmaengine maintainer update" 2/ Removal of net_dma, as it has been marked 'broken' since 3.13 (commit7787380336"net_dma: mark broken"), without reports of performance regression. 3/ Miscellaneous fixes" * tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine: net: make tcp_cleanup_rbuf private net_dma: revert 'copied_early' net_dma: simple removal dmaengine maintainer update dmatest: prevent memory leakage on error path in thread ioat: Use time_before_jiffies() dmaengine: fix xor sources continuation dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup() dma: mv_xor: Remove all callers of mv_xor_slot_cleanup() dma: mv_xor: Remove unneeded mv_xor_clean_completed_slots() call ioat: Use pci_enable_msix_exact() instead of pci_enable_msix() drivers: dma: Include appropriate header file in dca.c drivers: dma: Mark functions as static in dma_v3.c dma: mv_xor: Add DMA API error checks ioat/dca: Use dev_is_pci() to check whether it is pci device
52 lines
1.9 KiB
Makefile
52 lines
1.9 KiB
Makefile
subdir-ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG
|
|
subdir-ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
|
|
|
|
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
|
|
obj-$(CONFIG_DMA_VIRTUAL_CHANNELS) += virt-dma.o
|
|
obj-$(CONFIG_DMA_ACPI) += acpi-dma.o
|
|
obj-$(CONFIG_DMA_OF) += of-dma.o
|
|
|
|
obj-$(CONFIG_INTEL_MID_DMAC) += intel_mid_dma.o
|
|
obj-$(CONFIG_DMATEST) += dmatest.o
|
|
obj-$(CONFIG_INTEL_IOATDMA) += ioat/
|
|
obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
|
|
obj-$(CONFIG_FSL_DMA) += fsldma.o
|
|
obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o
|
|
obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
|
|
obj-$(CONFIG_MV_XOR) += mv_xor.o
|
|
obj-$(CONFIG_DW_DMAC_CORE) += dw/
|
|
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
|
|
obj-$(CONFIG_MX3_IPU) += ipu/
|
|
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
|
|
obj-$(CONFIG_SH_DMAE_BASE) += sh/
|
|
obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
|
|
obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
|
|
obj-$(CONFIG_IMX_SDMA) += imx-sdma.o
|
|
obj-$(CONFIG_IMX_DMA) += imx-dma.o
|
|
obj-$(CONFIG_MXS_DMA) += mxs-dma.o
|
|
obj-$(CONFIG_TIMB_DMA) += timb_dma.o
|
|
obj-$(CONFIG_SIRF_DMA) += sirf-dma.o
|
|
obj-$(CONFIG_TI_EDMA) += edma.o
|
|
obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
|
|
obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o
|
|
obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o
|
|
obj-$(CONFIG_PL330_DMA) += pl330.o
|
|
obj-$(CONFIG_PCH_DMA) += pch_dma.o
|
|
obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o
|
|
obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o
|
|
obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
|
|
obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o
|
|
obj-$(CONFIG_DMA_OMAP) += omap-dma.o
|
|
obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o
|
|
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o
|
|
obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o
|
|
obj-$(CONFIG_TI_CPPI41) += cppi41.o
|
|
obj-$(CONFIG_K3_DMA) += k3dma.o
|
|
obj-$(CONFIG_MOXART_DMA) += moxart-dma.o
|
|
obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
|
|
obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o
|
|
obj-y += xilinx/
|
|
obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
|
|
obj-$(CONFIG_NBPFAXI_DMA) += nbpfaxi.o
|
|
obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
|