linux-kernel - 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140528175531.4ce48afd@canb.auug.org.au>
Date:	Wed, 28 May 2014 17:55:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Joerg Roedel <joro@...tes.org>
Cc:	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: linux-next: manual merge of the driver-core tree with the iommu
 tree

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).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)