Messages in this thread | | | Date | Fri, 17 Jun 2011 10:26:37 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-lpae tree with the arm tree |
| |
Hi Catalin,
Today's linux-next merge of the arm-lpae tree got a conflict in arch/arm/mm/dma-mapping.c between commit 8f5d638883e0 ("ARM: DMA: steal memory for DMA coherent mappings") from the arm tree and commit 7b550c77c248 ("ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*") from the arm-lpae tree.
The former has removed all the references to the PGDIR_* macros from this file, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |