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]

Message-Id: <20120914164122.51b19b8796752399e287af5a@canb.auug.org.au>
Date:	Fri, 14 Sep 2012 16:41:22 +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>,
	Jeff Garzik <jeff@...zik.org>,
	Rob Herring <rob.herring@...xeda.com>
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
Documentation/devicetree/bindings/ata/ahci-platform.txt between commit
8996b89d6bc9 ("ata: add platform driver for Calxeda AHCI controller")
from the  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 Documentation/devicetree/bindings/ata/ahci-platform.txt
index 147c1f6,6c1ad01..0000000
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@@ -9,9 -9,7 +9,10 @@@ Required properties
  - reg               : <registers mapping>
  
  Optional properties:
 +- calxeda,port-phys: phandle-combophy and lane assignment, which maps each
 +			SATA port to a combophy and a lane within that
 +			combophy
+ - dma-coherent      : Present if dma operations are coherent
  
  Example:
          sata@...08000 {

Content of type "application/pgp-signature" skipped