linux-kernel - linux-next: manual merge of the dma-mapping tree with the driver-core 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130828170503.de07a17bcd5994a7434477da@canb.auug.org.au>
Date:	Wed, 28 Aug 2013 17:05:03 +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,
	Hanjun Guo <hanjun.guo@...aro.org>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the dma-mapping tree with the
 driver-core tree

Hi all,

Today's linux-next merge of the dma-mapping tree got a conflict in
drivers/base/dma-contiguous.c between commit cebcac7c59e8 ("drivers /
dma-contiguous: Fix __init attribute location") from the driver-core tree
and commit a2547380393a ("drivers: dma-contiguous: clean source code and
prepare for device tree") from the dma-mapping tree.

I fixed it up (the latter is a superset of the former, so I used that)
and can carry the fix as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped