linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20130828172618.GC5012@kroah.com>
Date:	Wed, 28 Aug 2013 10:26:18 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Marek Szyprowski <m.szyprowski@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hanjun Guo <hanjun.guo@...aro.org>
Subject: Re: linux-next: manual merge of the dma-mapping tree with the
 driver-core tree

On Wed, Aug 28, 2013 at 05:05:03PM +1000, Stephen Rothwell wrote:
> 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).

Sounds good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/