linux-kernel - linux-next: manual merge of the dma-mapping tree with the 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: <20120528132640.03db266f490fa5917a54bb6d@canb.auug.org.au>
Date:	Mon, 28 May 2012 13:26:40 +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
Subject: linux-next: manual merge of the dma-mapping tree with the  tree

Hi all,

Today's linux-next merge of the dma-mapping tree got conflicts in
arch/arm/Kconfig and arch/x86/include/asm/dma-mapping.h between various
commits from Linus' tree and various commits from the dma-mapping tree.

Again, these commits were rebased from what was merged into Linus' tree
via other trees.   Please do not do this.

I just used the version of these files from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped