linux-kernel - Re: linux-next: manual merge of the iommu tree with the tegra 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] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 24 Nov 2014 10:32:38 +0100
From:	Thierry Reding <treding@...dia.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Joerg Roedel <joro@...tes.org>,
	Stephen Warren <swarren@...dia.com>,
	"Colin Cross" <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	Olav Haugan <ohaugan@...eaurora.org>
Subject: Re: linux-next: manual merge of the iommu tree with the tegra tree

On Mon, Nov 24, 2014 at 03:33:10PM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
> 
> Hi Joerg,
> 
> Today's linux-next merge of the iommu tree got a conflict in
> drivers/iommu/tegra-smmu.c between commit a2257374a4bd ("memory: Add
> NVIDIA Tegra memory controller support") from the tegra tree and commit
> 315786ebbf4a ("iommu: Add iommu_map_sg() function") from the iommu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This conflict is uglier than I had anticipated. Perhaps it would make
sense to pull in a stable IOMMU branch into Tegra so that I can resolve
the conflict on top of that?

Joerg, do you have a stable branch containing the above commits that you
could provide for me to pull into the Tegra tree?

Thierry

Content of type "application/pgp-signature" skipped