787314c35f
A few new features this merge-window. The most important one is probably, that dma-debug now warns if a dma-handle is not checked with dma_mapping_error by the device driver. This requires minor changes to some architectures which make use of dma-debug. Most of these changes have the respective Acks by the Arch-Maintainers. Besides that there are updates to the AMD IOMMU driver for refactor the IOMMU-Groups support and to make sure it does not trigger a hardware erratum. The OMAP changes (for which I pulled in a branch from Tony Lindgren's tree) have a conflict in linux-next with the arm-soc tree. The conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is deleted in the arm-soc tree. It is safe to delete the file too so solve the conflict. Similar changes are done in the arm-soc tree in the common clock framework migration. A missing hunk from the patch in the IOMMU tree will be submitted as a seperate patch when the merge-window is closed. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQzbQQAAoJECvwRC2XARrjXCIP/2RxBzbVOiaPOorl+ZWbsZ41 lzWiXsCHJkh4BK4/qGsVeKhiNd9LcbQUlhywnBbhWxym3spzmjGtvU2Hcg8QiO/M R83r9S4e8Z6DnF9Gcats1Ns9BufgpyhLXg3XoXPxtyHOgRS59fvYi6xXOxyX30Dy uhbj+WL6UD0zvOMNztEnM1p6UhX+XlpvzKDTR5+G5xKdVPkcgeiaKSwqz739caTn QE2NpqIh+8Mwuu1nIapk8h07xhUYU5eGMXa38u1LvDwSHsrsCMLC+lXIjtInn7Gw Bv+XcCHgtOaoPQwwk/xd2HVwJQxO9HNb5YX51EIjwP0C5S/3yW9Ji1RgqFb6Ewqq jIkF6ckwUheLWsBGkw5UknI/f7RX3MDiTWkziYLIniYKKewm+ymGfgIqPt2TzLIO tMZZiIssKvy7wOXQ5JjpYJg5Xmrau6opNwdEguC8pWkJT7qsn+3SeLjMt0Lh9IoY +37DOgOLb3O3/vnZJ3i0KMRZBfVeaRj5HaGmlxFCYUZCNQymIPTih9Jtqm+WuVcu YaGQCTtynsQ0JVh8YEekLzSfgd3OODP68fyCg1CQNixEgvUi2hd/toX2/Z1wkkSA JC9bZarcoPkSWqaTAA2HvmaaxvRR+0UbhFPopFTQarVV0MVLZWBxoyuKy/nMrmMd UgTzrDYy74UKdrSTwIXg =pPHZ -----END PGP SIGNATURE----- Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu Pull IOMMU updates from Joerg Roedel: "A few new features this merge-window. The most important one is probably, that dma-debug now warns if a dma-handle is not checked with dma_mapping_error by the device driver. This requires minor changes to some architectures which make use of dma-debug. Most of these changes have the respective Acks by the Arch-Maintainers. Besides that there are updates to the AMD IOMMU driver for refactor the IOMMU-Groups support and to make sure it does not trigger a hardware erratum. The OMAP changes (for which I pulled in a branch from Tony Lindgren's tree) have a conflict in linux-next with the arm-soc tree. The conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is deleted in the arm-soc tree. It is safe to delete the file too so solve the conflict. Similar changes are done in the arm-soc tree in the common clock framework migration. A missing hunk from the patch in the IOMMU tree will be submitted as a seperate patch when the merge-window is closed." * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits) ARM: dma-mapping: support debug_dma_mapping_error ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks iommu/omap: Adapt to runtime pm iommu/omap: Migrate to hwmod framework iommu/omap: Keep mmu enabled when requested iommu/omap: Remove redundant clock handling on ISR iommu/amd: Remove obsolete comment iommu/amd: Don't use 512GB pages iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch iommu/tegra: gart: Move bus_set_iommu after probe for multi arch iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all tile: dma_debug: add debug_dma_mapping_error support sh: dma_debug: add debug_dma_mapping_error support powerpc: dma_debug: add debug_dma_mapping_error support mips: dma_debug: add debug_dma_mapping_error support microblaze: dma-mapping: support debug_dma_mapping_error ia64: dma_debug: add debug_dma_mapping_error support c6x: dma_debug: add debug_dma_mapping_error support ARM64: dma_debug: add debug_dma_mapping_error support intel-iommu: Prevent devices with RMRRs from being placed into SI Domain ... |
||
|---|---|---|
| .. | ||
| ad5449.h | ||
| ad5755.h | ||
| ad7266.h | ||
| ad7298.h | ||
| ad7791.h | ||
| ad7793.h | ||
| ad7887.h | ||
| ads7828.h | ||
| asoc-imx-ssi.h | ||
| asoc-kirkwood.h | ||
| asoc-mx27vis.h | ||
| asoc-palm27x.h | ||
| asoc-s3c.h | ||
| asoc-s3c24xx_simtec.h | ||
| asoc-ti-mcbsp.h | ||
| at91_adc.h | ||
| ata-pxa.h | ||
| ata-samsung_cf.h | ||
| atmel-aes.h | ||
| atmel.h | ||
| camera-mx1.h | ||
| camera-mx2.h | ||
| camera-mx3.h | ||
| camera-pxa.h | ||
| clk-integrator.h | ||
| clk-nomadik.h | ||
| clk-realview.h | ||
| clk-u300.h | ||
| clk-ux500.h | ||
| clocksource-nomadik-mtu.h | ||
| cpsw.h | ||
| crypto-ux500.h | ||
| davinci_asp.h | ||
| db8500_thermal.h | ||
| dma-atmel.h | ||
| dma-ep93xx.h | ||
| dma-imx-sdma.h | ||
| dma-imx.h | ||
| dma-mmp_tdma.h | ||
| dma-mv_xor.h | ||
| dma-ste-dma40.h | ||
| dmtimer-omap.h | ||
| dsp-omap.h | ||
| dwc3-exynos.h | ||
| dwc3-omap.h | ||
| efm32-uart.h | ||
| ehci-sh.h | ||
| emif_plat.h | ||
| eth-netx.h | ||
| exynos_thermal.h | ||
| fsa9480.h | ||
| gpio-em.h | ||
| gpio-omap.h | ||
| gpio-ts5500.h | ||
| hwmon-s3c.h | ||
| i2c-cbus-gpio.h | ||
| i2c-davinci.h | ||
| i2c-imx.h | ||
| i2c-nomadik.h | ||
| i2c-nuc900.h | ||
| i2c-s3c2410.h | ||
| ina2xx.h | ||
| iommu-omap.h | ||
| irda-pxaficp.h | ||
| keyboard-pxa930_rotary.h | ||
| keyboard-spear.h | ||
| keypad-ep93xx.h | ||
| keypad-nomadik-ske.h | ||
| keypad-omap.h | ||
| keypad-pxa27x.h | ||
| keypad-w90p910.h | ||
| keyscan-davinci.h | ||
| lcd-mipid.h | ||
| leds-kirkwood-netxbig.h | ||
| leds-kirkwood-ns2.h | ||
| leds-lm355x.h | ||
| leds-lm3642.h | ||
| leds-omap.h | ||
| leds-pca9633.h | ||
| leds-renesas-tpu.h | ||
| leds-s3c24xx.h | ||
| lm3630_bl.h | ||
| lm3639_bl.h | ||
| lp855x.h | ||
| lp8727.h | ||
| macb.h | ||
| max197.h | ||
| max310x.h | ||
| mfd-mcp-sa11x0.h | ||
| mipi-csis.h | ||
| mmc-davinci.h | ||
| mmc-esdhc-imx.h | ||
| mmc-msm_sdcc.h | ||
| mmc-mvsdio.h | ||
| mmc-mxcmmc.h | ||
| mmc-omap.h | ||
| mmc-pxamci.h | ||
| mmc-s3cmci.h | ||
| mmc-sdhci-tegra.h | ||
| mmp_audio.h | ||
| mmp_dma.h | ||
| mouse-pxa930_trkball.h | ||
| msm_serial_hs.h | ||
| mtd-davinci-aemif.h | ||
| mtd-davinci.h | ||
| mtd-mxc_nand.h | ||
| mtd-nand-omap2.h | ||
| mtd-nand-pxa3xx.h | ||
| mtd-nand-s3c2410.h | ||
| mtd-onenand-omap2.h | ||
| mtd-orion_nand.h | ||
| mv_usb.h | ||
| ntc_thermistor.h | ||
| omap-abe-twl6040.h | ||
| omap-twl4030.h | ||
| omap-wd-timer.h | ||
| omap1_bl.h | ||
| omap4-keypad.h | ||
| omap_drm.h | ||
| omap_ocp2scp.h | ||
| pcmcia-pxa2xx_viper.h | ||
| pinctrl-coh901.h | ||
| pinctrl-nomadik.h | ||
| pn544.h | ||
| pxa2xx_udc.h | ||
| pxa_sdhci.h | ||
| remoteproc-omap.h | ||
| s3c-hsotg.h | ||
| s3c-hsudc.h | ||
| sa11x0-serial.h | ||
| sc18is602.h | ||
| sccnxp.h | ||
| serial-imx.h | ||
| serial-omap.h | ||
| shmob_drm.h | ||
| sht15.h | ||
| spi-clps711x.h | ||
| spi-davinci.h | ||
| spi-ep93xx.h | ||
| spi-imx.h | ||
| spi-nuc900.h | ||
| spi-omap2-mcspi.h | ||
| spi-s3c64xx.h | ||
| tegra_emc.h | ||
| tegra_usb.h | ||
| ti_am335x_adc.h | ||
| touchscreen-s3c2410.h | ||
| uio_dmem_genirq.h | ||
| uio_pruss.h | ||
| usb-davinci.h | ||
| usb-ehci-mxc.h | ||
| usb-ehci-orion.h | ||
| usb-ehci-s5p.h | ||
| usb-exynos.h | ||
| usb-imx_udc.h | ||
| usb-musb-ux500.h | ||
| usb-mx2.h | ||
| usb-ohci-pxa27x.h | ||
| usb-ohci-s3c2410.h | ||
| usb-omap.h | ||
| usb-pxa3xx-ulpi.h | ||
| usb-s3c2410_udc.h | ||
| video-ep93xx.h | ||
| video-imxfb.h | ||
| video-msm_fb.h | ||
| video-mx3fb.h | ||
| video-nuc900fb.h | ||
| video-pxafb.h | ||
| video-vt8500lcdfb.h | ||
| voltage-omap.h | ||
| wiznet.h | ||