linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the arm-soc tree with the arm-current tree
@ 2012-09-04  6:06 Stephen Rothwell
  2012-09-04  8:08 ` Arnd Bergmann
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2012-09-04  6:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Rob Herring, Russell King

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit c2794437091a ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree.

I am not sure how to fix this, so I have used the arm-current version of
the change to pmd_empty_section_gap() since that changed the vm->flags.
It may be that just changing the vm->flags value in vm_reserve_area_early()
would be ok?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm-current tree
@ 2013-04-11  6:21 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2013-04-11  6:21 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Russell King

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/configs/h7201_defconfig and arch/arm/configs/h7202_defconfig
between commit e42c3074c8f7 ("ARM: remove NWFPE and VFP emulation code
from the kernel") from the arm-current tree and commit 293eb135a924
("ARM: kill Hynix h720x platform") from the arm-soc tree.

The latter deleted the files, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm-current tree
@ 2015-01-29 22:58 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2015-01-29 22:58 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel, Russell King
  Cc: linux-next, linux-kernel, Will Deacon, Laurent Pinchart

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mm/dma-mapping.c between commit c2273a185354 ("ARM: 8288/1:
dma-mapping: don't detach devices without an IOMMU during teardown")
from the arm-current tree and commit eab8d6530cc0 ("arm: dma-mapping:
Set DMA IOMMU ops in arm_iommu_attach_device()") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mm/dma-mapping.c
index f142ddd6c40a,a673c7f7e208..000000000000
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -2025,10 -2048,7 +2048,10 @@@ static void arm_teardown_iommu_dma_ops(
  {
  	struct dma_iommu_mapping *mapping = dev->archdata.mapping;
  
 +	if (!mapping)
 +		return;
 +
- 	arm_iommu_detach_device(dev);
+ 	__arm_iommu_detach_device(dev);
  	arm_iommu_release_mapping(mapping);
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-01-29 22:58 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04  6:06 linux-next: manual merge of the arm-soc tree with the arm-current tree Stephen Rothwell
2012-09-04  8:08 ` Arnd Bergmann
2012-09-04  9:01   ` Russell King - ARM Linux
2012-09-04 12:44     ` Rob Herring
2012-09-04 13:03       ` Stephen Rothwell
2012-09-04 13:11       ` Arnd Bergmann
2012-09-04 13:19         ` Stephen Rothwell
2013-04-11  6:21 Stephen Rothwell
2015-01-29 22:58 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).