linux-kernel - Re: linux-next: manual merge of the driver-core tree with the iommu 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: <20140528183523.GA16719@kroah.com>
Date:	Wed, 28 May 2014 11:35:23 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Joerg Roedel <joro@...tes.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Jean Delvare <jdelvare@...e.de>,
	Cho KyongHo <pullip.cho@...sung.com>,
	Shaik Ameer Basha <shaik.ameer@...sung.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the iommu
 tree

On Wed, May 28, 2014 at 05:55:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/iommu/exynos-iommu.c between commit 7222e8db2d50
> ("iommu/exynos: Fix build errors") from the iommu tree and commit
> 8283b4919e00 ("driver core: dev_set_drvdata can no longer fail") from
> the driver-core tree.
> 
> I fixed it up (the former removed the code changed by the latter) 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/