linux-kernel - linux-next: manual merge of the dma-mapping tree with the libata tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 14 Sep 2012 16:43:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marek Szyprowski <m.szyprowski@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark Langsdorf <mark.langsdorf@...xeda.com>,
	Rob Herring <rob.herring@...xeda.com>,
	Jeff Garzik <jeff@...zik.org>
Subject: linux-next: manual merge of the dma-mapping tree with the libata
 tree

Hi all,

Today's linux-next merge of the dma-mapping tree got a conflict in
arch/arm/boot/dts/highbank.dts between commit 8996b89d6bc9 ("ata: add
platform driver for Calxeda AHCI controller") from the libata tree and
commit 33e4628cc333 ("ARM: highbank: add coherent DMA setup") from the
dma-mapping tree.

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

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

diff --cc arch/arm/boot/dts/highbank.dts
index 5204cf7,7414577..0000000
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@@ -121,9 -121,7 +121,10 @@@
  			compatible = "calxeda,hb-ahci";
  			reg = <0xffe08000 0x10000>;
  			interrupts = <0 83 4>;
 +			calxeda,port-phys = <&combophy5 0 &combophy0 0
 +					     &combophy0 1 &combophy0 2
 +					     &combophy0 3>;
+ 			dma-coherent;
  		};
  
  		sdhci@...0e000 {

Content of type "application/pgp-signature" skipped