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] [day] [month] [year] [list]

Date:	Mon, 24 Nov 2014 17:16:48 +0100
From:	Joerg Roedel <joro@...tes.org>
To:	Thierry Reding <treding@...dia.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	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

Hi Thierry,

On Mon, Nov 24, 2014 at 10:32:38AM +0100, Thierry Reding wrote:
> 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?

Yes, you can pull in the core branch from the iommu-tree. It should
contain the conflicting patch.


	Joerg

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