linux-kernel - Re: linux-next: manual merge of the arm-lpae tree with the arm 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: <20110617101717.GB9504@e102109-lin.cambridge.arm.com>
Date:	Fri, 17 Jun 2011 11:17:17 +0100
From:	Catalin Marinas <catalin.marinas@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree

Hi Stephen,

On Fri, Jun 17, 2011 at 01:26:37AM +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/dma-mapping.c between commit 8f5d638883e0 ("ARM: DMA: steal
> memory for DMA coherent mappings") from the arm tree and commit
> 7b550c77c248 ("ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*")
> from the arm-lpae tree.
> 
> The former has removed all the references to the PGDIR_* macros from this
> file, so I used that.

The fix is correct. I also did a kernel build for Versatile Express and
there were no errors.

Thanks.

-- 
Catalin

--
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/