Linus Torvalds
32d687cad3
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
...
Pull DMA-mapping fixes from Marek Szyprowski:
"Another set of fixes for ARM dma-mapping subsystem.
Commit e9da6e9905 replaced custom consistent buffer remapping code
with generic vmalloc areas. It however introduced some regressions
caused by limited support for allocations in atomic context. This
series contains fixes for those regressions.
For some subplatforms the default, pre-allocated pool for atomic
allocations turned out to be too small, so a function for setting its
size has been added.
Another set of patches adds support for atomic allocations to
IOMMU-aware DMA-mapping implementation.
The last part of this pull request contains two fixes for Contiguous
Memory Allocator, which relax too strict requirements."
* 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMIC
ARM: dma-mapping: Introduce __atomic_get_pages() for __iommu_get_pages()
ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
ARM: dma-mapping: atomic_pool with struct page **pages
ARM: Kirkwood: increase atomic coherent pool size
ARM: DMA-Mapping: print warning when atomic coherent allocation fails
ARM: DMA-Mapping: add function for setting coherent pool size from platform code
ARM: relax conditions required for enabling Contiguous Memory Allocator
mm: cma: fix alignment requirements for contiguous regions
2012-09-08 16:22:43 -07:00
..
boot
Fixes for AT91 related to:
2012-08-27 17:07:37 -07:00
common
ARM: dma-mapping: add support for dma_get_sgtable()
2012-07-30 12:25:47 +02:00
configs
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
2012-09-04 21:41:35 -07:00
include /asm
ARM: DMA-Mapping: add function for setting coherent pool size from platform code
2012-08-28 21:01:02 +02:00
kernel
ARM: 7486/1: sched_clock: update epoch_cyc on resume
2012-08-11 09:15:58 +01:00
lib
ARM: Bring back ARMv3 IO and user access code
2012-08-13 11:44:13 +01:00
mach-at91
ARM: at91/clock: fix PLLA overclock warning
2012-08-23 15:00:09 +02:00
mach-bcmring
mach-clps711x
mach-cns3xxx
mach-davinci
ARM: davinci: remove broken ntosd2_init_i2c
2012-08-10 13:14:36 +02:00
mach-dove
ARM: Orion: Set eth packet size csum offload limit
2012-08-15 13:58:09 +00:00
mach-ebsa110
mach-ep93xx
arm-soc: soc-specific updates
2012-07-23 16:08:40 -07:00
mach-exynos
Merge branch 'v3.6-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-08-23 17:03:49 +02:00
mach-footbridge
mach-gemini
ARM: gemini: fix the gemini build
2012-09-04 22:17:34 -07:00
mach-h720x
mach-highbank
mach-imx
Merge branch 'randconfig/mach' into fixes
2012-08-23 17:30:54 +02:00
mach-integrator
ARM: integrator: include <linux/export.h>
2012-08-09 15:16:44 +02:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-kirkwood
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-09-08 16:22:43 -07:00
mach-ks8695
mach-l7200/include /mach
mach-lpc32xx
mach-mmp
ARM: mmp: fix potential NULL dereference
2012-08-10 22:32:24 +08:00
mach-msm
mach-mv78xx0
Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes
2012-08-15 18:18:29 +02:00
mach-mvebu
mach-mxs
ARM: mxs: always build ocotp
2012-08-04 22:52:23 +08:00
mach-netx
arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n
2012-07-30 17:25:13 -07:00
mach-nomadik
mach-omap1
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
mach-omap2
Merge branch 'randconfig/mach' into fixes
2012-08-23 17:30:54 +02:00
mach-orion5x
ARM: Orion: Set eth packet size csum offload limit
2012-08-15 13:58:09 +00:00
mach-picoxcell
mach-pnx4008
mach-prima2
ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes
2012-08-02 10:05:27 -07:00
mach-pxa
Input: eeti_ts: pass gpio value instead of IRQ
2012-08-09 15:16:41 +02:00
mach-realview
mach-rpc
mach-s3c24xx
Merge branch 'v3.6-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-08-23 17:03:49 +02:00
mach-s3c64xx
ARM: arm-soc soc updates, take 2
2012-07-30 09:45:53 -07:00
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-s5pc100
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-s5pv210
arm-soc: board specific updates
2012-07-23 17:34:48 -07:00
mach-sa1100
ARM: sa1100: include linux/io.h in hackkit leds code
2012-08-09 15:16:42 +02:00
mach-shark
mach-shmobile
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
2012-09-04 21:41:35 -07:00
mach-socfpga
mach-spear3xx
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
mach-spear6xx
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
mach-spear13xx
mach-tegra
ARM: tegra: more regulator fixes for Harmony
2012-08-09 15:16:40 +02:00
mach-u300
mach-ux500
Merge branch 'randconfig/mach' into fixes
2012-08-23 17:30:54 +02:00
mach-versatile
mach-vexpress
mach-vt8500
Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
2012-07-30 09:22:37 -07:00
mach-w90x900
mach-zynq
mm
ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMIC
2012-08-28 21:01:07 +02:00
net
nwfpe
oprofile
plat-iop
plat-mxc
ARM: SoC fixes
2012-08-02 11:48:20 -07:00
plat-nomadik
plat-omap
ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*()
2012-08-13 06:23:16 -07:00
plat-orion
ARM: Orion: Set eth packet size csum offload limit
2012-08-15 13:58:09 +00:00
plat-pxa
Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
2012-07-30 09:22:37 -07:00
plat-s3c24xx
ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
2012-08-08 09:04:51 +09:00
plat-samsung
Merge branch 'v3.6-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-08-23 17:03:49 +02:00
plat-spear
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
plat-versatile
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
tools
vfp
ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled
2012-08-11 09:15:57 +01:00
Kconfig
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-09-08 16:22:43 -07:00
Kconfig-nommu
Kconfig.debug
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
Makefile
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00